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

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

diff -u --recursive --new-file v2.4.1/linux/drivers/net/3c509.c linux/drivers/net/3c509.c
@@ -5,7 +5,7 @@
 	Copyright 1994-1998 by Donald Becker.
 	Copyright 1993 United States Government as represented by the
 	Director, National Security Agency.	 This software may be used and
-	distributed according to the terms of the GNU Public License,
+	distributed according to the terms of the GNU General Public License,
 	incorporated herein by reference.
 
 	This driver is for the 3Com EtherLinkIII series.
@@ -59,7 +59,7 @@
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -889,6 +889,7 @@
 				outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
 				skb->protocol = eth_type_trans(skb,dev);
 				netif_rx(skb);
+				dev->last_rx = jiffies;
 				lp->stats.rx_packets++;
 				continue;
 			}