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/sunqe.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/net/sunqe.c')
| -rw-r--r-- | drivers/net/sunqe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index 7eb295cd6..9643d4c1a 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c @@ -20,7 +20,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/delay.h> #include <linux/init.h> @@ -438,6 +438,7 @@ static void qe_rx(struct sunqe *qep) len, 0); skb->protocol = eth_type_trans(skb, qep->dev); netif_rx(skb); + dev->last_rx = jiffies; qep->net_stats.rx_packets++; qep->net_stats.rx_bytes += len; } |