aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/cxgb4vf/sge.c1
-rw-r--r--drivers/net/pxa168_eth.c1
-rw-r--r--net/l2tp/l2tp_eth.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/cxgb4vf/sge.c
index eb5a1c9cb2d3..e00fd9c36e8b 100644
--- a/drivers/net/cxgb4vf/sge.c
+++ b/drivers/net/cxgb4vf/sge.c
@@ -1520,7 +1520,6 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp,
1520 __skb_pull(skb, PKTSHIFT); 1520 __skb_pull(skb, PKTSHIFT);
1521 skb->protocol = eth_type_trans(skb, rspq->netdev); 1521 skb->protocol = eth_type_trans(skb, rspq->netdev);
1522 skb_record_rx_queue(skb, rspq->idx); 1522 skb_record_rx_queue(skb, rspq->idx);
1523 skb->dev->last_rx = jiffies; /* XXX removed 2.6.29 */
1524 pi = netdev_priv(skb->dev); 1523 pi = netdev_priv(skb->dev);
1525 rxq->stats.pkts++; 1524 rxq->stats.pkts++;
1526 1525
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
index 659915cf6872..764aa9099468 100644
--- a/drivers/net/pxa168_eth.c
+++ b/drivers/net/pxa168_eth.c
@@ -848,7 +848,6 @@ static int rxq_process(struct net_device *dev, int budget)
848 skb->protocol = eth_type_trans(skb, dev); 848 skb->protocol = eth_type_trans(skb, dev);
849 netif_receive_skb(skb); 849 netif_receive_skb(skb);
850 } 850 }
851 dev->last_rx = jiffies;
852 } 851 }
853 /* Fill RX ring with skb's */ 852 /* Fill RX ring with skb's */
854 rxq_refill(dev); 853 rxq_refill(dev);
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 58c6c4cda73b..f3468ba3f5cb 100644
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -144,7 +144,6 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
144 nf_reset(skb); 144 nf_reset(skb);
145 145
146 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) { 146 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
147 dev->last_rx = jiffies;
148 dev->stats.rx_packets++; 147 dev->stats.rx_packets++;
149 dev->stats.rx_bytes += data_len; 148 dev->stats.rx_bytes += data_len;
150 } else 149 } else