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/sunqe.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 7eb295cd6..9643d4c1a 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -20,7 +20,7 @@ static char *version =
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -438,6 +438,7 @@ static void qe_rx(struct sunqe *qep)
 						 len, 0);
 				skb->protocol = eth_type_trans(skb, qep->dev);
 				netif_rx(skb);
+				dev->last_rx = jiffies;
 				qep->net_stats.rx_packets++;
 				qep->net_stats.rx_bytes += len;
 			}
-- 
cgit v1.2.3