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

• Lines: 41
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/cs89x0.c
• Orig date: Tue Nov 14 11:34:25 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/cs89x0.c linux/drivers/net/cs89x0.c
@@ -7,7 +7,7 @@
 	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, 521 Pleasant Valley Rd., Potsdam, NY 13676
@@ -119,7 +119,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 <asm/system.h>
 #include <asm/bitops.h>
@@ -773,8 +773,9 @@
 	}
         skb->protocol=eth_type_trans(skb,dev);
 	netif_rx(skb);
+	dev->last_rx = jiffies;
 	lp->stats.rx_packets++;
-	return;
+	lp->stats.rx_bytes += length;
 }
 
 #endif	/* ALLOW_DMA */
@@ -1446,9 +1447,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;
 }
 
 #if ALLOW_DMA