diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/net/82596.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index eb3253b82..bb0e79f5a 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c @@ -32,7 +32,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 @@ -51,7 +51,7 @@ static const char *version = "82596.c $Revision: 1.4 $\n"; #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> @@ -807,6 +807,7 @@ memory_squeeze: pkt_len); #endif netif_rx(skb); + dev->last_rx = jiffies; lp->stats.rx_packets++; lp->stats.rx_bytes+=pkt_len; } |