提交 d2ad3ca8 编写于 作者: D David S. Miller

net/: 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: NDavid S. Miller <davem@davemloft.net>
上级 265eb67f
...@@ -24,7 +24,6 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, ...@@ -24,7 +24,6 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
* due to congestion. */ * due to congestion. */
return NET_RX_SUCCESS; return NET_RX_SUCCESS;
} }
skb->dev->last_rx = jiffies;
skb->vlan_tci = 0; skb->vlan_tci = 0;
stats = &skb->dev->stats; stats = &skb->dev->stats;
......
...@@ -163,8 +163,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, ...@@ -163,8 +163,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
goto err_unlock; goto err_unlock;
} }
skb->dev->last_rx = jiffies;
stats = &skb->dev->stats; stats = &skb->dev->stats;
stats->rx_packets++; stats->rx_packets++;
stats->rx_bytes += skb->len; stats->rx_bytes += skb->len;
......
...@@ -311,7 +311,6 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) ...@@ -311,7 +311,6 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
struct sk_buff *nskb; struct sk_buff *nskb;
u8 type; u8 type;
dev->last_rx = jiffies;
s->stats.rx_bytes += skb->len; s->stats.rx_bytes += skb->len;
type = *(u8 *) skb->data; skb_pull(skb, 1); type = *(u8 *) skb->data; skb_pull(skb, 1);
......
...@@ -161,7 +161,6 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev, ...@@ -161,7 +161,6 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev,
skb_push(skb, ETH_HLEN); skb_push(skb, ETH_HLEN);
skb->protocol = eth_type_trans(skb, skb->dev); skb->protocol = eth_type_trans(skb, skb->dev);
skb->dev->last_rx = jiffies;
skb->dev->stats.rx_packets++; skb->dev->stats.rx_packets++;
skb->dev->stats.rx_bytes += skb->len; skb->dev->stats.rx_bytes += skb->len;
......
...@@ -180,7 +180,6 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev, ...@@ -180,7 +180,6 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev,
skb_push(skb, ETH_HLEN); skb_push(skb, ETH_HLEN);
skb->protocol = eth_type_trans(skb, skb->dev); skb->protocol = eth_type_trans(skb, skb->dev);
skb->dev->last_rx = jiffies;
skb->dev->stats.rx_packets++; skb->dev->stats.rx_packets++;
skb->dev->stats.rx_bytes += skb->len; skb->dev->stats.rx_bytes += skb->len;
......
...@@ -97,7 +97,6 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev, ...@@ -97,7 +97,6 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
skb_push(skb, ETH_HLEN); skb_push(skb, ETH_HLEN);
skb->protocol = eth_type_trans(skb, skb->dev); skb->protocol = eth_type_trans(skb, skb->dev);
skb->dev->last_rx = jiffies;
skb->dev->stats.rx_packets++; skb->dev->stats.rx_packets++;
skb->dev->stats.rx_bytes += skb->len; skb->dev->stats.rx_bytes += skb->len;
......
...@@ -533,8 +533,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -533,8 +533,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
} }
#endif #endif
dev->last_rx = jiffies;
#ifdef NOT_YET #ifdef NOT_YET
if ((ieee->iw_mode == IW_MODE_MASTER || if ((ieee->iw_mode == IW_MODE_MASTER ||
ieee->iw_mode == IW_MODE_REPEAT) && !from_assoc_ap) { ieee->iw_mode == IW_MODE_REPEAT) && !from_assoc_ap) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册