patch-2.4.2 linux/drivers/net/82596.c

• Lines: 26
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/82596.c
• Orig date: Tue Nov 14 11:24:14 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/82596.c linux/drivers/net/82596.c
@@ -32,7 +32,7 @@
    Written 1993 by Donald Becker.
    Copyright 1993 United States Government as represented by the Director,
    National Security Agency. This software may only be used and distributed
-   according to the terms of the GNU Public License as modified by SRC,
+   according to the terms of the GNU General Public License as modified by SRC,
    incorporated herein by reference.
 
    The author may be reached as becker@super.org or
@@ -51,7 +51,7 @@
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
@@ -807,6 +807,7 @@
 						pkt_len);
 #endif
 				netif_rx(skb);
+				dev->last_rx = jiffies;
 				lp->stats.rx_packets++;
 				lp->stats.rx_bytes+=pkt_len;
 			}