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/mac89x0.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/net/mac89x0.c')
| -rw-r--r-- | drivers/net/mac89x0.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index f2298caac..847a77ef1 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c @@ -1,10 +1,10 @@ -/* cs89x0.c: A Crystal Semiconductor CS89[02]0 driver for linux. */ +/* mac89x0.c: A Crystal Semiconductor CS89[02]0 driver for linux. */ /* Written 1996 by Russell Nelson, with reference to skeleton.c written 1993-1994 by Donald Becker. 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. The author may be reached at nelson@crynwr.com, Crynwr Software, 11 Grant St., Potsdam, NY 13676 @@ -86,7 +86,7 @@ static char *version = #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/nubus.h> #include <asm/system.h> @@ -527,9 +527,9 @@ net_rx(struct net_device *dev) skb->protocol=eth_type_trans(skb,dev); netif_rx(skb); + dev->last_rx = jiffies; lp->stats.rx_packets++; - lp->stats.rx_bytes+=skb->len; - return; + lp->stats.rx_bytes += length; } /* The inverse routine to net_open(). */ |