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

Next file: linux/drivers/net/smc9194.h
Previous file: linux/drivers/net/smc-ultra32.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/net/smc9194.c linux/drivers/net/smc9194.c
@@ -4,7 +4,7 @@
  .
  . Copyright (C) 1996 by Erik Stahlman
  . 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.
  .
  . "Features" of the SMC chip:
  .   4608 byte packet memory. ( for the 91C92.  Others have more )
@@ -66,7 +66,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/init.h>
 #include <asm/bitops.h>
@@ -1384,7 +1384,9 @@
 
 		skb->protocol = eth_type_trans(skb, dev );
 		netif_rx(skb);
+		dev->last_rx = jiffies;
 		lp->stats.rx_packets++;
+		lp->stats.rx_bytes += packet_length;
 	} else {
 		/* error ... */
 		lp->stats.rx_errors++;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)