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

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

diff -u --recursive --new-file v2.4.1/linux/drivers/net/ni52.c linux/drivers/net/ni52.c
@@ -2,7 +2,7 @@
  * net-3-driver for the NI5210 card (i82586 Ethernet chip)
  *
  * This is an extension to the Linux operating system, and is covered by the
- * same Gnu Public License that covers that work.
+ * same GNU General Public License that covers that work.
  *
  * Alphacode 0.82 (96/09/29) for Linux 2.0.0 (or later)
  * Copyrights (c) 1994,1995,1996 by M.Hipp (hippm@informatik.uni-tuebingen.de)
@@ -111,7 +111,7 @@
 #include <linux/string.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>
@@ -918,7 +918,9 @@
 						eth_copy_and_sum(skb,(char *) p->base+(unsigned long) rbd->buffer,totlen,0);
 						skb->protocol=eth_type_trans(skb,dev);
 						netif_rx(skb);
+						dev->last_rx = jiffies;
 						p->stats.rx_packets++;
+						p->stats.rx_bytes += totlen;
 					}
 					else
 						p->stats.rx_dropped++;

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