From 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Apr 2001 04:55:58 +0000 Subject: 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. --- drivers/net/de600.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'drivers/net/de600.c') diff --git a/drivers/net/de600.c b/drivers/net/de600.c index 4549d2c5e..efd974baa 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c @@ -616,11 +616,15 @@ de600_rx_intr(struct net_device *dev) for (i = size; i > 0; --i, ++buffer) *buffer = de600_read_byte(READ_DATA, dev); - ((struct net_device_stats *)(dev->priv))->rx_packets++; /* count all receives */ - skb->protocol=eth_type_trans(skb,dev); netif_rx(skb); + + /* update stats */ + dev->last_rx = jiffies; + ((struct net_device_stats *)(dev->priv))->rx_packets++; /* count all receives */ + ((struct net_device_stats *)(dev->priv))->rx_bytes += size; /* count all received bytes */ + /* * If any worth-while packets have been received, netif_rx() * has done a mark_bh(INET_BH) for us and will work on them -- cgit v1.2.3