aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-08-31 02:34:50 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-03 02:07:36 -0400
commit451f14439847db302e5104c44458b2dbb4b1829d (patch)
tree697046c4438806c37c5b0835dc71b7fdd35b8a92 /drivers
parent6ce9e7b5fe3195d1ae6e3a0753d4ddcac5cd699e (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')
-rw-r--r--drivers/firewire/net.c2
-rw-r--r--drivers/ieee1394/eth1394.c1
-rw-r--r--drivers/infiniband/hw/amso1100/c2.c1
-rw-r--r--drivers/infiniband/hw/nes/nes_hw.c2
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_cm.c1
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_ib.c1
-rw-r--r--drivers/misc/sgi-xp/xpnet.c1
-rw-r--r--drivers/net/arm/ks8695net.c1
-rw-r--r--drivers/net/arm/w90p910_ether.c1
-rw-r--r--drivers/net/atl1c/atl1c_main.c1
-rw-r--r--drivers/net/benet/be_main.c2
-rw-r--r--drivers/net/can/dev.c1
-rw-r--r--drivers/net/can/sja1000/sja1000.c2
-rw-r--r--drivers/net/davinci_emac.c1
-rw-r--r--drivers/net/ethoc.c1
-rw-r--r--drivers/net/igbvf/netdev.c4
-rw-r--r--drivers/net/smsc911x.c1
-rw-r--r--drivers/net/smsc9420.c1
-rw-r--r--drivers/net/vxge/vxge-main.c2
-rw-r--r--drivers/net/wireless/b43legacy/xmit.c1
-rw-r--r--drivers/net/xilinx_emaclite.c1
-rw-r--r--drivers/s390/net/ctcm_main.c1
-rw-r--r--drivers/s390/net/netiucv.c1
-rw-r--r--drivers/s390/net/qeth_l2_main.c1
-rw-r--r--drivers/s390/net/qeth_l3_main.c1
25 files changed, 1 insertions, 32 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 84edc8b84c62..cbaf420c36c5 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -663,8 +663,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
663 if (netif_queue_stopped(net)) 663 if (netif_queue_stopped(net))
664 netif_wake_queue(net); 664 netif_wake_queue(net);
665 665
666 net->last_rx = jiffies;
667
668 return 0; 666 return 0;
669} 667}
670 668
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 3a62c4c2d419..a4e9dcb6d4a9 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1301,7 +1301,6 @@ static void ether1394_iso(struct hpsb_iso *iso)
1301 1301
1302 hpsb_iso_recv_release_packets(iso, i); 1302 hpsb_iso_recv_release_packets(iso, i);
1303 1303
1304 dev->last_rx = jiffies;
1305} 1304}
1306 1305
1307/****************************************** 1306/******************************************
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
2743skip_rx_indicate0: 2743skip_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
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 212da9af1ce7..16f0abda1423 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -240,7 +240,6 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)
240 (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb), 240 (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
241 skb_end_pointer(skb), skb->len); 241 skb_end_pointer(skb), skb->len);
242 242
243 xpnet_device->last_rx = jiffies;
244 xpnet_device->stats.rx_packets++; 243 xpnet_device->stats.rx_packets++;
245 xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN; 244 xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
246 245
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index 4f702d52606a..2a7b7745cc55 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -467,7 +467,6 @@ ks8695_rx_irq(int irq, void *dev_id)
467 netif_rx(skb); 467 netif_rx(skb);
468 468
469 /* Record stats */ 469 /* Record stats */
470 ndev->last_rx = jiffies;
471 ndev->stats.rx_packets++; 470 ndev->stats.rx_packets++;
472 ndev->stats.rx_bytes += pktlen; 471 ndev->stats.rx_bytes += pktlen;
473 goto rx_finished; 472 goto rx_finished;
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c
index 3a0948f02b46..25e2627eb118 100644
--- a/drivers/net/arm/w90p910_ether.c
+++ b/drivers/net/arm/w90p910_ether.c
@@ -777,7 +777,6 @@ static void netdev_rx(struct net_device *dev)
777 777
778 rxbd = &ether->rdesc->desclist[ether->cur_rx]; 778 rxbd = &ether->rdesc->desclist[ether->cur_rx];
779 779
780 dev->last_rx = jiffies;
781 } while (1); 780 } while (1);
782} 781}
783 782
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index bf7cc83e9836..e46bf9238692 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -1740,7 +1740,6 @@ rrs_checked:
1740 } else 1740 } else
1741 netif_receive_skb(skb); 1741 netif_receive_skb(skb);
1742 1742
1743 netdev->last_rx = jiffies;
1744 (*work_done)++; 1743 (*work_done)++;
1745 count++; 1744 count++;
1746 } 1745 }
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index e19fe1dcd144..bac85f950394 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -775,8 +775,6 @@ static void be_rx_compl_process(struct be_adapter *adapter,
775 netif_receive_skb(skb); 775 netif_receive_skb(skb);
776 } 776 }
777 777
778 adapter->netdev->last_rx = jiffies;
779
780 return; 778 return;
781} 779}
782 780
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
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 5e6652b8728d..d465eaa796c4 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1920,7 +1920,6 @@ static int emac_net_rx_cb(struct emac_priv *priv,
1920 skb_put(p_skb, net_pkt_list->pkt_length); 1920 skb_put(p_skb, net_pkt_list->pkt_length);
1921 EMAC_CACHE_INVALIDATE((unsigned long)p_skb->data, p_skb->len); 1921 EMAC_CACHE_INVALIDATE((unsigned long)p_skb->data, p_skb->len);
1922 p_skb->protocol = eth_type_trans(p_skb, priv->ndev); 1922 p_skb->protocol = eth_type_trans(p_skb, priv->ndev);
1923 p_skb->dev->last_rx = jiffies;
1924 netif_receive_skb(p_skb); 1923 netif_receive_skb(p_skb);
1925 priv->net_dev_stats.rx_bytes += net_pkt_list->pkt_length; 1924 priv->net_dev_stats.rx_bytes += net_pkt_list->pkt_length;
1926 priv->net_dev_stats.rx_packets++; 1925 priv->net_dev_stats.rx_packets++;
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b871aefed9c6..b7311bc00258 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -404,7 +404,6 @@ static int ethoc_rx(struct net_device *dev, int limit)
404 void *src = priv->membase + bd.addr; 404 void *src = priv->membase + bd.addr;
405 memcpy_fromio(skb_put(skb, size), src, size); 405 memcpy_fromio(skb_put(skb, size), src, size);
406 skb->protocol = eth_type_trans(skb, dev); 406 skb->protocol = eth_type_trans(skb, dev);
407 dev->last_rx = jiffies;
408 priv->stats.rx_packets++; 407 priv->stats.rx_packets++;
409 priv->stats.rx_bytes += size; 408 priv->stats.rx_bytes += size;
410 netif_receive_skb(skb); 409 netif_receive_skb(skb);
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index dadb78229ad5..91024a3cdad3 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -96,8 +96,6 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter,
96 E1000_RXD_SPC_VLAN_MASK); 96 E1000_RXD_SPC_VLAN_MASK);
97 else 97 else
98 netif_receive_skb(skb); 98 netif_receive_skb(skb);
99
100 netdev->last_rx = jiffies;
101} 99}
102 100
103static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter, 101static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
@@ -342,8 +340,6 @@ send_up:
342 igbvf_receive_skb(adapter, netdev, skb, staterr, 340 igbvf_receive_skb(adapter, netdev, skb, staterr,
343 rx_desc->wb.upper.vlan); 341 rx_desc->wb.upper.vlan);
344 342
345 netdev->last_rx = jiffies;
346
347next_desc: 343next_desc:
348 rx_desc->wb.upper.status_error = 0; 344 rx_desc->wb.upper.status_error = 0;
349 345
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index c2667855a005..ccdd196f5297 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -1047,7 +1047,6 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
1047 /* Update counters */ 1047 /* Update counters */
1048 dev->stats.rx_packets++; 1048 dev->stats.rx_packets++;
1049 dev->stats.rx_bytes += (pktlength - 4); 1049 dev->stats.rx_bytes += (pktlength - 4);
1050 dev->last_rx = jiffies;
1051 } 1050 }
1052 1051
1053 /* Return total received packets */ 1052 /* Return total received packets */
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 514311d67b36..b4909a2dec66 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -817,7 +817,6 @@ static void smsc9420_rx_handoff(struct smsc9420_pdata *pd, const int index,
817 skb->protocol = eth_type_trans(skb, dev); 817 skb->protocol = eth_type_trans(skb, dev);
818 818
819 netif_receive_skb(skb); 819 netif_receive_skb(skb);
820 dev->last_rx = jiffies;
821} 820}
822 821
823static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index) 822static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index)
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 41dccba50c46..b378037a29b5 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -588,8 +588,6 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
588 if (first_dtr) 588 if (first_dtr)
589 vxge_hw_ring_rxd_post_post_wmb(ringh, first_dtr); 589 vxge_hw_ring_rxd_post_post_wmb(ringh, first_dtr);
590 590
591 dev->last_rx = jiffies;
592
593 vxge_debug_entryexit(VXGE_TRACE, 591 vxge_debug_entryexit(VXGE_TRACE,
594 "%s:%d Exiting...", 592 "%s:%d Exiting...",
595 __func__, __LINE__); 593 __func__, __LINE__);
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index f79cee82601b..103f3c9e7f58 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -590,7 +590,6 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
590 chanstat); 590 chanstat);
591 } 591 }
592 592
593 dev->stats.last_rx = jiffies;
594 memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status)); 593 memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
595 ieee80211_rx_irqsafe(dev->wl->hw, skb); 594 ieee80211_rx_irqsafe(dev->wl->hw, skb);
596 595
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 7e05b40ae36b..dc22782633a5 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -587,7 +587,6 @@ static void xemaclite_rx_handler(struct net_device *dev)
587 587
588 dev->stats.rx_packets++; 588 dev->stats.rx_packets++;
589 dev->stats.rx_bytes += len; 589 dev->stats.rx_bytes += len;
590 dev->last_rx = jiffies;
591 590
592 netif_rx(skb); /* Send the packet upstream */ 591 netif_rx(skb); /* Send the packet upstream */
593} 592}
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 38b5079f1599..c5b83874500c 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -164,7 +164,6 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
164 priv->stats.rx_packets++; 164 priv->stats.rx_packets++;
165 priv->stats.rx_bytes += skblen; 165 priv->stats.rx_bytes += skblen;
166 netif_rx_ni(skb); 166 netif_rx_ni(skb);
167 dev->last_rx = jiffies;
168 if (len > 0) { 167 if (len > 0) {
169 skb_pull(pskb, header->length); 168 skb_pull(pskb, header->length);
170 if (skb_tailroom(pskb) < LL_HEADER_LENGTH) { 169 if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index bb1183a2ed66..271c4a82e84b 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -676,7 +676,6 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
676 * we must use netif_rx_ni() instead of netif_rx() 676 * we must use netif_rx_ni() instead of netif_rx()
677 */ 677 */
678 netif_rx_ni(skb); 678 netif_rx_ni(skb);
679 dev->last_rx = jiffies;
680 skb_pull(pskb, header->next); 679 skb_pull(pskb, header->next);
681 skb_put(pskb, NETIUCV_HDRLEN); 680 skb_put(pskb, NETIUCV_HDRLEN);
682 } 681 }
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 94b161121c26..f4f3ca1393b2 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -449,7 +449,6 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card,
449 QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN); 449 QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN);
450 continue; 450 continue;
451 } 451 }
452 card->dev->last_rx = jiffies;
453 card->stats.rx_packets++; 452 card->stats.rx_packets++;
454 card->stats.rx_bytes += len; 453 card->stats.rx_bytes += len;
455 } 454 }
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 115b4a0dae6e..073b6d354915 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1987,7 +1987,6 @@ static void qeth_l3_process_inbound_buffer(struct qeth_card *card,
1987 continue; 1987 continue;
1988 } 1988 }
1989 1989
1990 card->dev->last_rx = jiffies;
1991 card->stats.rx_packets++; 1990 card->stats.rx_packets++;
1992 card->stats.rx_bytes += len; 1991 card->stats.rx_bytes += len;
1993 } 1992 }