patch-2.4.2 linux/drivers/net/3c505.c

• Lines: 17
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/3c505.c
• Orig date: Tue Nov 14 13:16:37 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/3c505.c linux/drivers/net/3c505.c
@@ -99,7 +99,7 @@
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
 #include <asm/bitops.h>
@@ -689,6 +689,7 @@
 					skb->protocol = eth_type_trans(skb,dev);
 					adapter->stats.rx_bytes += skb->len;
 					netif_rx(skb);
+					dev->last_rx = jiffies;
 				}
 			}
 			adapter->dmaing = 0;