diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/arm/ks8695net.c | 1 | ||||
-rw-r--r-- | drivers/net/arm/w90p910_ether.c | 1 | ||||
-rw-r--r-- | drivers/net/atl1c/atl1c_main.c | 1 | ||||
-rw-r--r-- | drivers/net/benet/be_main.c | 2 | ||||
-rw-r--r-- | drivers/net/can/dev.c | 1 | ||||
-rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 2 | ||||
-rw-r--r-- | drivers/net/davinci_emac.c | 1 | ||||
-rw-r--r-- | drivers/net/ethoc.c | 1 | ||||
-rw-r--r-- | drivers/net/igbvf/netdev.c | 4 | ||||
-rw-r--r-- | drivers/net/smsc911x.c | 1 | ||||
-rw-r--r-- | drivers/net/smsc9420.c | 1 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/xmit.c | 1 | ||||
-rw-r--r-- | drivers/net/xilinx_emaclite.c | 1 |
14 files changed, 0 insertions, 20 deletions
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 = ðer->rdesc->desclist[ether->cur_rx]; | 778 | rxbd = ðer->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 | ||
103 | static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter, | 101 | static 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 | |||
347 | next_desc: | 343 | next_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 | ||
823 | static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index) | 822 | static 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 | } |