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/infiniband | |
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/infiniband')
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2.c | 1 | ||||
-rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 | ||||
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c index 0cfbb6d2f762..8c5d2842fbb5 100644 --- a/drivers/infiniband/hw/amso1100/c2.c +++ b/drivers/infiniband/hw/amso1100/c2.c | |||
@@ -530,7 +530,6 @@ static void c2_rx_interrupt(struct net_device *netdev) | |||
530 | 530 | ||
531 | netif_rx(skb); | 531 | netif_rx(skb); |
532 | 532 | ||
533 | netdev->last_rx = jiffies; | ||
534 | netdev->stats.rx_packets++; | 533 | netdev->stats.rx_packets++; |
535 | netdev->stats.rx_bytes += buflen; | 534 | netdev->stats.rx_bytes += buflen; |
536 | } | 535 | } |
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 4a84d02ece06..97d4c2a33ed6 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
@@ -2741,7 +2741,7 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq) | |||
2741 | } | 2741 | } |
2742 | 2742 | ||
2743 | skip_rx_indicate0: | 2743 | skip_rx_indicate0: |
2744 | nesvnic->netdev->last_rx = jiffies; | 2744 | ; |
2745 | /* nesvnic->netstats.rx_packets++; */ | 2745 | /* nesvnic->netstats.rx_packets++; */ |
2746 | /* nesvnic->netstats.rx_bytes += rx_pkt_size; */ | 2746 | /* nesvnic->netstats.rx_bytes += rx_pkt_size; */ |
2747 | } | 2747 | } |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 181b1f32325f..986f07fb3ec4 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c | |||
@@ -663,7 +663,6 @@ copied: | |||
663 | skb_reset_mac_header(skb); | 663 | skb_reset_mac_header(skb); |
664 | skb_pull(skb, IPOIB_ENCAP_LEN); | 664 | skb_pull(skb, IPOIB_ENCAP_LEN); |
665 | 665 | ||
666 | dev->last_rx = jiffies; | ||
667 | ++dev->stats.rx_packets; | 666 | ++dev->stats.rx_packets; |
668 | dev->stats.rx_bytes += skb->len; | 667 | dev->stats.rx_bytes += skb->len; |
669 | 668 | ||
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index e7e5adf84e84..c9dcb2064f20 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c | |||
@@ -277,7 +277,6 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) | |||
277 | skb_reset_mac_header(skb); | 277 | skb_reset_mac_header(skb); |
278 | skb_pull(skb, IPOIB_ENCAP_LEN); | 278 | skb_pull(skb, IPOIB_ENCAP_LEN); |
279 | 279 | ||
280 | dev->last_rx = jiffies; | ||
281 | ++dev->stats.rx_packets; | 280 | ++dev->stats.rx_packets; |
282 | dev->stats.rx_bytes += skb->len; | 281 | dev->stats.rx_bytes += skb->len; |
283 | 282 | ||