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

• Lines: 54
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/lasi_82596.c
• Orig date: Wed Dec 6 11:46:39 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/lasi_82596.c linux/drivers/net/lasi_82596.c
@@ -60,7 +60,7 @@
    Written 1993 by Donald Becker.
    Copyright 1993 United States Government as represented by the Director,
    National Security Agency. This software may only be used and distributed
-   according to the terms of the GNU Public License as modified by SRC,
+   according to the terms of the GNU General Public License as modified by SRC,
    incorporated herein by reference.
 
    The author may be reached as becker@super.org or
@@ -68,8 +68,6 @@
 
  */
 
-static const char *version = "82596.c $Revision: 1.14 $\n";
-
 #include <linux/module.h>
 
 #include <linux/kernel.h>
@@ -78,7 +76,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/netdevice.h>
@@ -97,6 +95,9 @@
 #include <asm/gsc.h>
 #include <asm/cache.h>
 
+static char version[] __initdata =
+	"82596.c $Revision: 1.14 $\n";
+
 /* DEBUG flags
  */
 
@@ -374,7 +375,7 @@
 	dma_addr_t dma_addr;
 };
 
-char init_setup[] =
+static char init_setup[] =
 {
 	0x8E,			/* length, prefetch on */
 	0xC8,			/* fifo to 8, monitor off */
@@ -790,6 +791,7 @@
 				skb->len = pkt_len;
 				skb->protocol=eth_type_trans(skb,dev);
 				netif_rx(skb);
+				dev->last_rx = jiffies;
 				lp->stats.rx_packets++;
 				lp->stats.rx_bytes+=pkt_len;
 			}