From 116674acc97ba75a720329996877077d988443a2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 9 Mar 2001 20:33:35 +0000
Subject: Merge with Linux 2.4.2.

---
 drivers/net/ethertap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'drivers/net/ethertap.c')

diff --git a/drivers/net/ethertap.c b/drivers/net/ethertap.c
index 5863998cb..c24fe32a8 100644
--- a/drivers/net/ethertap.c
+++ b/drivers/net/ethertap.c
@@ -16,7 +16,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 
@@ -279,6 +279,7 @@ static __inline__ int ethertap_rx_skb(struct sk_buff *skb, struct net_device *de
 	lp->stats.rx_packets++;
 	lp->stats.rx_bytes+=len;
 	netif_rx(skb);
+	dev->last_rx = jiffies;
 	return len;
 }
 
-- 
cgit v1.2.3