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

• Lines: 34
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/mac89x0.c
• Orig date: Sat Dec 30 18:16:13 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/mac89x0.c linux/drivers/net/mac89x0.c
@@ -1,10 +1,10 @@
-/* cs89x0.c: A Crystal Semiconductor CS89[02]0 driver for linux. */
+/* mac89x0.c: A Crystal Semiconductor CS89[02]0 driver for linux. */
 /*
 	Written 1996 by Russell Nelson, with reference to skeleton.c
 	written 1993-1994 by Donald Becker.
 
 	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.
 
 	The author may be reached at nelson@crynwr.com, Crynwr
 	Software, 11 Grant St., Potsdam, NY 13676
@@ -86,7 +86,7 @@
 #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/nubus.h>
 #include <asm/system.h>
@@ -527,9 +527,9 @@
 
         skb->protocol=eth_type_trans(skb,dev);
 	netif_rx(skb);
+	dev->last_rx = jiffies;
 	lp->stats.rx_packets++;
-	lp->stats.rx_bytes+=skb->len;
-	return;
+	lp->stats.rx_bytes += length;
 }
 
 /* The inverse routine to net_open(). */