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/sun3lance.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/net/sun3lance.c')
| -rw-r--r-- | drivers/net/sun3lance.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 52b62ee9f..08088fa96 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c @@ -3,7 +3,7 @@ Sun3 Lance ethernet driver, by Sam Creasey (sammy@users.qual.net). This driver is a part of the linux kernel, and is thus distributed - under the GNU Public License. + under the GNU General Public License. The values used in LANCE_OBIO and LANCE_IRQ seem to be empirically true for the correct IRQ and address of the lance registers. They @@ -31,7 +31,7 @@ static char *version = "sun3lance.c: v1.1 11/17/1999 Sam Creasey (sammy@oh.veri #include <linux/string.h> #include <linux/ptrace.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/init.h> #include <linux/ioport.h> @@ -780,8 +780,9 @@ static int lance_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; + lp->stats.rx_bytes += pkt_len; } } |