diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-10 18:48:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-13 06:32:43 -0400 |
commit | 127aa0e14b3e1f8476c4781facdfac11d5546872 (patch) | |
tree | 939bdf390d438942fb1efbc158f92705900817f9 /drivers | |
parent | acbbc07145b919248c410e1852b953d385be5c97 (diff) |
drivers: net: last_rx elimination
Network drivers do not have to update last_rx, unless they need it for
their private use.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/bcm63xx_enet.c | 1 | ||||
-rw-r--r-- | drivers/net/can/at91_can.c | 2 | ||||
-rw-r--r-- | drivers/net/ixgbevf/ixgbevf_main.c | 1 | ||||
-rw-r--r-- | drivers/net/ksz884x.c | 2 | ||||
-rw-r--r-- | drivers/net/octeon/octeon_mgmt.c | 1 | ||||
-rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 1 | ||||
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 1 |
7 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index 37a4be57a2b7..9a8bdea4a8ec 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c | |||
@@ -344,7 +344,6 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget) | |||
344 | skb->protocol = eth_type_trans(skb, dev); | 344 | skb->protocol = eth_type_trans(skb, dev); |
345 | priv->stats.rx_packets++; | 345 | priv->stats.rx_packets++; |
346 | priv->stats.rx_bytes += len; | 346 | priv->stats.rx_bytes += len; |
347 | dev->last_rx = jiffies; | ||
348 | netif_receive_skb(skb); | 347 | netif_receive_skb(skb); |
349 | 348 | ||
350 | } while (--budget > 0); | 349 | } while (--budget > 0); |
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index 3f7ceaebd687..5f983487d6e4 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c | |||
@@ -661,7 +661,6 @@ static int at91_poll_err(struct net_device *dev, int quota, u32 reg_sr) | |||
661 | at91_poll_err_frame(dev, cf, reg_sr); | 661 | at91_poll_err_frame(dev, cf, reg_sr); |
662 | netif_receive_skb(skb); | 662 | netif_receive_skb(skb); |
663 | 663 | ||
664 | dev->last_rx = jiffies; | ||
665 | dev->stats.rx_packets++; | 664 | dev->stats.rx_packets++; |
666 | dev->stats.rx_bytes += cf->can_dlc; | 665 | dev->stats.rx_bytes += cf->can_dlc; |
667 | 666 | ||
@@ -898,7 +897,6 @@ static void at91_irq_err(struct net_device *dev) | |||
898 | at91_irq_err_state(dev, cf, new_state); | 897 | at91_irq_err_state(dev, cf, new_state); |
899 | netif_rx(skb); | 898 | netif_rx(skb); |
900 | 899 | ||
901 | dev->last_rx = jiffies; | ||
902 | dev->stats.rx_packets++; | 900 | dev->stats.rx_packets++; |
903 | dev->stats.rx_bytes += cf->can_dlc; | 901 | dev->stats.rx_bytes += cf->can_dlc; |
904 | 902 | ||
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c index d0c3538271e3..960e98532ee2 100644 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c | |||
@@ -611,7 +611,6 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, | |||
611 | skb->protocol = eth_type_trans(skb, adapter->netdev); | 611 | skb->protocol = eth_type_trans(skb, adapter->netdev); |
612 | 612 | ||
613 | ixgbevf_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc); | 613 | ixgbevf_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc); |
614 | adapter->netdev->last_rx = jiffies; | ||
615 | 614 | ||
616 | next_desc: | 615 | next_desc: |
617 | rx_desc->wb.upper.status_error = 0; | 616 | rx_desc->wb.upper.status_error = 0; |
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index 870185837a3b..4a231bdb5671 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
@@ -5054,8 +5054,6 @@ static inline int rx_proc(struct net_device *dev, struct ksz_hw* hw, | |||
5054 | priv->stats.rx_bytes += packet_len; | 5054 | priv->stats.rx_bytes += packet_len; |
5055 | 5055 | ||
5056 | /* Notify upper layer for received packet. */ | 5056 | /* Notify upper layer for received packet. */ |
5057 | dev->last_rx = jiffies; | ||
5058 | |||
5059 | rx_status = netif_rx(skb); | 5057 | rx_status = netif_rx(skb); |
5060 | 5058 | ||
5061 | return 0; | 5059 | return 0; |
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c index 0e2ff1ec58e4..6b1d443f2ce5 100644 --- a/drivers/net/octeon/octeon_mgmt.c +++ b/drivers/net/octeon/octeon_mgmt.c | |||
@@ -317,7 +317,6 @@ good: | |||
317 | skb->protocol = eth_type_trans(skb, netdev); | 317 | skb->protocol = eth_type_trans(skb, netdev); |
318 | netdev->stats.rx_packets++; | 318 | netdev->stats.rx_packets++; |
319 | netdev->stats.rx_bytes += skb->len; | 319 | netdev->stats.rx_bytes += skb->len; |
320 | netdev->last_rx = jiffies; | ||
321 | netif_receive_skb(skb); | 320 | netif_receive_skb(skb); |
322 | rc = 0; | 321 | rc = 0; |
323 | } else if (re.s.code == RING_ENTRY_CODE_MORE) { | 322 | } else if (re.s.code == RING_ENTRY_CODE_MORE) { |
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index cc532ef28c8f..cbe2404223d7 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c | |||
@@ -1280,7 +1280,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit) | |||
1280 | 1280 | ||
1281 | priv->dev->stats.rx_packets++; | 1281 | priv->dev->stats.rx_packets++; |
1282 | priv->dev->stats.rx_bytes += frame_len; | 1282 | priv->dev->stats.rx_bytes += frame_len; |
1283 | priv->dev->last_rx = jiffies; | ||
1284 | } | 1283 | } |
1285 | entry = next_entry; | 1284 | entry = next_entry; |
1286 | p = p_next; /* use prefetched values */ | 1285 | p = p_next; /* use prefetched values */ |
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 58dfa367bf86..90e783a09245 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
@@ -1174,7 +1174,6 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, | |||
1174 | netif_receive_skb(skb); | 1174 | netif_receive_skb(skb); |
1175 | } | 1175 | } |
1176 | 1176 | ||
1177 | adapter->netdev->last_rx = jiffies; | ||
1178 | ctx->skb = NULL; | 1177 | ctx->skb = NULL; |
1179 | } | 1178 | } |
1180 | 1179 | ||