diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-08-31 02:34:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-03 02:07:36 -0400 |
commit | 451f14439847db302e5104c44458b2dbb4b1829d (patch) | |
tree | 697046c4438806c37c5b0835dc71b7fdd35b8a92 /drivers/net/can | |
parent | 6ce9e7b5fe3195d1ae6e3a0753d4ddcac5cd699e (diff) |
drivers: Kill now superfluous ->last_rx stores
The generic packet receive code takes care of setting
netdev->last_rx when necessary, for the sake of the
bonding ARP monitor.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Neil Horman <nhorman@txudriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
-rw-r--r-- | drivers/net/can/dev.c | 1 | ||||
-rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index e1a4f8214239..1d29082d94ac 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c | |||
@@ -357,7 +357,6 @@ void can_restart(unsigned long data) | |||
357 | 357 | ||
358 | netif_rx(skb); | 358 | netif_rx(skb); |
359 | 359 | ||
360 | dev->last_rx = jiffies; | ||
361 | stats->rx_packets++; | 360 | stats->rx_packets++; |
362 | stats->rx_bytes += cf->can_dlc; | 361 | stats->rx_bytes += cf->can_dlc; |
363 | 362 | ||
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 9ce3ddac4e9b..fd7fa716a6ca 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c | |||
@@ -340,7 +340,6 @@ static void sja1000_rx(struct net_device *dev) | |||
340 | 340 | ||
341 | netif_rx(skb); | 341 | netif_rx(skb); |
342 | 342 | ||
343 | dev->last_rx = jiffies; | ||
344 | stats->rx_packets++; | 343 | stats->rx_packets++; |
345 | stats->rx_bytes += dlc; | 344 | stats->rx_bytes += dlc; |
346 | } | 345 | } |
@@ -455,7 +454,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) | |||
455 | 454 | ||
456 | netif_rx(skb); | 455 | netif_rx(skb); |
457 | 456 | ||
458 | dev->last_rx = jiffies; | ||
459 | stats->rx_packets++; | 457 | stats->rx_packets++; |
460 | stats->rx_bytes += cf->can_dlc; | 458 | stats->rx_bytes += cf->can_dlc; |
461 | 459 | ||