diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/net/de620.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/net/de620.c')
| -rw-r--r-- | drivers/net/de620.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index ecc71eb00..713e40b6e 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c @@ -563,7 +563,6 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev) printk(KERN_WARNING "%s: No tx-buffer available!\n", dev->name); restore_flags(flags); return 1; - break; } de620_write_block(dev, buffer, len); @@ -699,8 +698,10 @@ static int de620_rx_intr(struct net_device *dev) PRINTK(("Read %d bytes\n", size)); skb->protocol=eth_type_trans(skb,dev); netif_rx(skb); /* deliver it "upstairs" */ + dev->last_rx = jiffies; /* count all receives */ ((struct net_device_stats *)(dev->priv))->rx_packets++; + ((struct net_device_stats *)(dev->priv))->rx_bytes += size; } } |