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

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

diff -u --recursive --new-file v2.4.1/linux/drivers/net/3c527.c linux/drivers/net/3c527.c
@@ -11,7 +11,7 @@
  *	documentation.
  *
  *	This software may be used and distributed according to the terms
- *	of the GNU Public License, incorporated herein by reference.
+ *	of the GNU General Public License, incorporated herein by reference.
  *
  */
 
@@ -66,7 +66,7 @@
 #include <linux/mca.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <asm/system.h>
 #include <asm/bitops.h>
@@ -1069,9 +1069,10 @@
 					bus_to_virt(p->data), length);
 				skb->protocol=eth_type_trans(skb,dev);
 				skb->dev=dev;
-				lp->net_stats.rx_packets++;
-				lp->net_stats.rx_bytes+=skb->len;
 				netif_rx(skb);
+				dev->last_rx = jiffies;
+				lp->net_stats.rx_packets++;
+				lp->net_stats.rx_bytes += length;
 			}
 			else
 				lp->net_stats.rx_dropped++;