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

Next file: linux/drivers/net/depca.h
Previous file: linux/drivers/net/defxx.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/net/depca.c linux/drivers/net/depca.c
@@ -12,7 +12,7 @@
 
 
     This software may be used and distributed according to the terms of
-    the GNU Public License, incorporated herein by reference.
+    the GNU General Public License, incorporated herein by reference.
 
     This driver is written for the Digital Equipment Corporation series
     of DEPCA and EtherWORKS ethernet cards:
@@ -241,7 +241,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/init.h>
@@ -990,11 +990,13 @@
 	  */
 	  skb->protocol=eth_type_trans(skb,dev);
 	  netif_rx(skb);
- 
+
 	  /*
 	  ** Update stats
 	  */
+	  dev->last_rx = jiffies;
 	  lp->stats.rx_packets++;
+	  lp->stats.rx_bytes += pkt_len;
 	  for (i=1; i<DEPCA_PKT_STAT_SZ-1; i++) {
 	    if (pkt_len < (i*DEPCA_PKT_BIN_SZ)) {
 	      lp->pktStats.bins[i]++;

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