diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:03:12 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:06:46 +1100 |
commit | cf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch) | |
tree | 8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/tulip/interrupt.c | |
parent | eabeb7dac4934602a90b14649c07c13eb7e43d90 (diff) | |
parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/tulip/interrupt.c')
-rw-r--r-- | drivers/net/tulip/interrupt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index c6bad987d63e..739d610d18c5 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c @@ -231,7 +231,6 @@ int tulip_poll(struct napi_struct *napi, int budget) netif_receive_skb(skb); - dev->last_rx = jiffies; tp->stats.rx_packets++; tp->stats.rx_bytes += pkt_len; } @@ -444,7 +443,6 @@ static int tulip_rx(struct net_device *dev) netif_rx(skb); - dev->last_rx = jiffies; tp->stats.rx_packets++; tp->stats.rx_bytes += pkt_len; } |