From d715eeff663354bc61da3ebb660f410b3fa4f533 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 10 Apr 2010 22:48:14 +0000
Subject: [PATCH] --- yaml --- r: 194049 b: refs/heads/master c:
 127aa0e14b3e1f8476c4781facdfac11d5546872 h: refs/heads/master i:   194047:
 012cb600ca78513c17e0414df71d4836b087dba1 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/bcm63xx_enet.c         | 1 -
 trunk/drivers/net/can/at91_can.c         | 2 --
 trunk/drivers/net/ixgbevf/ixgbevf_main.c | 1 -
 trunk/drivers/net/ksz884x.c              | 2 --
 trunk/drivers/net/octeon/octeon_mgmt.c   | 1 -
 trunk/drivers/net/stmmac/stmmac_main.c   | 1 -
 trunk/drivers/net/vmxnet3/vmxnet3_drv.c  | 1 -
 8 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8e69aaa6bc6e..d134f66086c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acbbc07145b919248c410e1852b953d385be5c97
+refs/heads/master: 127aa0e14b3e1f8476c4781facdfac11d5546872
diff --git a/trunk/drivers/net/bcm63xx_enet.c b/trunk/drivers/net/bcm63xx_enet.c
index 37a4be57a2b7..9a8bdea4a8ec 100644
--- a/trunk/drivers/net/bcm63xx_enet.c
+++ b/trunk/drivers/net/bcm63xx_enet.c
@@ -344,7 +344,6 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
 		skb->protocol = eth_type_trans(skb, dev);
 		priv->stats.rx_packets++;
 		priv->stats.rx_bytes += len;
-		dev->last_rx = jiffies;
 		netif_receive_skb(skb);
 
 	} while (--budget > 0);
diff --git a/trunk/drivers/net/can/at91_can.c b/trunk/drivers/net/can/at91_can.c
index 3f7ceaebd687..5f983487d6e4 100644
--- a/trunk/drivers/net/can/at91_can.c
+++ b/trunk/drivers/net/can/at91_can.c
@@ -661,7 +661,6 @@ static int at91_poll_err(struct net_device *dev, int quota, u32 reg_sr)
 	at91_poll_err_frame(dev, cf, reg_sr);
 	netif_receive_skb(skb);
 
-	dev->last_rx = jiffies;
 	dev->stats.rx_packets++;
 	dev->stats.rx_bytes += cf->can_dlc;
 
@@ -898,7 +897,6 @@ static void at91_irq_err(struct net_device *dev)
 	at91_irq_err_state(dev, cf, new_state);
 	netif_rx(skb);
 
-	dev->last_rx = jiffies;
 	dev->stats.rx_packets++;
 	dev->stats.rx_bytes += cf->can_dlc;
 
diff --git a/trunk/drivers/net/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ixgbevf/ixgbevf_main.c
index d0c3538271e3..960e98532ee2 100644
--- a/trunk/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/trunk/drivers/net/ixgbevf/ixgbevf_main.c
@@ -611,7 +611,6 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector,
 		skb->protocol = eth_type_trans(skb, adapter->netdev);
 
 		ixgbevf_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc);
-		adapter->netdev->last_rx = jiffies;
 
 next_desc:
 		rx_desc->wb.upper.status_error = 0;
diff --git a/trunk/drivers/net/ksz884x.c b/trunk/drivers/net/ksz884x.c
index 870185837a3b..4a231bdb5671 100644
--- a/trunk/drivers/net/ksz884x.c
+++ b/trunk/drivers/net/ksz884x.c
@@ -5054,8 +5054,6 @@ static inline int rx_proc(struct net_device *dev, struct ksz_hw* hw,
 	priv->stats.rx_bytes += packet_len;
 
 	/* Notify upper layer for received packet. */
-	dev->last_rx = jiffies;
-
 	rx_status = netif_rx(skb);
 
 	return 0;
diff --git a/trunk/drivers/net/octeon/octeon_mgmt.c b/trunk/drivers/net/octeon/octeon_mgmt.c
index 0e2ff1ec58e4..6b1d443f2ce5 100644
--- a/trunk/drivers/net/octeon/octeon_mgmt.c
+++ b/trunk/drivers/net/octeon/octeon_mgmt.c
@@ -317,7 +317,6 @@ static int octeon_mgmt_receive_one(struct octeon_mgmt *p)
 		skb->protocol = eth_type_trans(skb, netdev);
 		netdev->stats.rx_packets++;
 		netdev->stats.rx_bytes += skb->len;
-		netdev->last_rx = jiffies;
 		netif_receive_skb(skb);
 		rc = 0;
 	} else if (re.s.code == RING_ENTRY_CODE_MORE) {
diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c
index cc532ef28c8f..cbe2404223d7 100644
--- a/trunk/drivers/net/stmmac/stmmac_main.c
+++ b/trunk/drivers/net/stmmac/stmmac_main.c
@@ -1280,7 +1280,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
 
 			priv->dev->stats.rx_packets++;
 			priv->dev->stats.rx_bytes += frame_len;
-			priv->dev->last_rx = jiffies;
 		}
 		entry = next_entry;
 		p = p_next;	/* use prefetched values */
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
index 58dfa367bf86..90e783a09245 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1174,7 +1174,6 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
 				netif_receive_skb(skb);
 			}
 
-			adapter->netdev->last_rx = jiffies;
 			ctx->skb = NULL;
 		}