diff options
| -rw-r--r-- | net/8021q/vlan_core.c | 1 | ||||
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/bnep/core.c | 1 | ||||
| -rw-r--r-- | net/dsa/tag_dsa.c | 1 | ||||
| -rw-r--r-- | net/dsa/tag_edsa.c | 1 | ||||
| -rw-r--r-- | net/dsa/tag_trailer.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_rx.c | 2 |
7 files changed, 0 insertions, 9 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 916061f681b6..118adef476c3 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c | |||
| @@ -24,7 +24,6 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp, | |||
| 24 | * due to congestion. */ | 24 | * due to congestion. */ |
| 25 | return NET_RX_SUCCESS; | 25 | return NET_RX_SUCCESS; |
| 26 | } | 26 | } |
| 27 | skb->dev->last_rx = jiffies; | ||
| 28 | skb->vlan_tci = 0; | 27 | skb->vlan_tci = 0; |
| 29 | 28 | ||
| 30 | stats = &skb->dev->stats; | 29 | stats = &skb->dev->stats; |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index c269fcbd13d5..e4bf39f87032 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -163,8 +163,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
| 163 | goto err_unlock; | 163 | goto err_unlock; |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | skb->dev->last_rx = jiffies; | ||
| 167 | |||
| 168 | stats = &skb->dev->stats; | 166 | stats = &skb->dev->stats; |
| 169 | stats->rx_packets++; | 167 | stats->rx_packets++; |
| 170 | stats->rx_bytes += skb->len; | 168 | stats->rx_bytes += skb->len; |
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 80ba30cf4b68..7a4d5303b4fe 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
| @@ -311,7 +311,6 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) | |||
| 311 | struct sk_buff *nskb; | 311 | struct sk_buff *nskb; |
| 312 | u8 type; | 312 | u8 type; |
| 313 | 313 | ||
| 314 | dev->last_rx = jiffies; | ||
| 315 | s->stats.rx_bytes += skb->len; | 314 | s->stats.rx_bytes += skb->len; |
| 316 | 315 | ||
| 317 | type = *(u8 *) skb->data; skb_pull(skb, 1); | 316 | type = *(u8 *) skb->data; skb_pull(skb, 1); |
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index bdc0510b53b7..ff55823a6534 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c | |||
| @@ -161,7 +161,6 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 161 | skb_push(skb, ETH_HLEN); | 161 | skb_push(skb, ETH_HLEN); |
| 162 | skb->protocol = eth_type_trans(skb, skb->dev); | 162 | skb->protocol = eth_type_trans(skb, skb->dev); |
| 163 | 163 | ||
| 164 | skb->dev->last_rx = jiffies; | ||
| 165 | skb->dev->stats.rx_packets++; | 164 | skb->dev->stats.rx_packets++; |
| 166 | skb->dev->stats.rx_bytes += skb->len; | 165 | skb->dev->stats.rx_bytes += skb->len; |
| 167 | 166 | ||
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c index f985ea993843..24b1c76fa7a4 100644 --- a/net/dsa/tag_edsa.c +++ b/net/dsa/tag_edsa.c | |||
| @@ -180,7 +180,6 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 180 | skb_push(skb, ETH_HLEN); | 180 | skb_push(skb, ETH_HLEN); |
| 181 | skb->protocol = eth_type_trans(skb, skb->dev); | 181 | skb->protocol = eth_type_trans(skb, skb->dev); |
| 182 | 182 | ||
| 183 | skb->dev->last_rx = jiffies; | ||
| 184 | skb->dev->stats.rx_packets++; | 183 | skb->dev->stats.rx_packets++; |
| 185 | skb->dev->stats.rx_bytes += skb->len; | 184 | skb->dev->stats.rx_bytes += skb->len; |
| 186 | 185 | ||
diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c index d3117764b2c2..3bfd2e55877a 100644 --- a/net/dsa/tag_trailer.c +++ b/net/dsa/tag_trailer.c | |||
| @@ -97,7 +97,6 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 97 | skb_push(skb, ETH_HLEN); | 97 | skb_push(skb, ETH_HLEN); |
| 98 | skb->protocol = eth_type_trans(skb, skb->dev); | 98 | skb->protocol = eth_type_trans(skb, skb->dev); |
| 99 | 99 | ||
| 100 | skb->dev->last_rx = jiffies; | ||
| 101 | skb->dev->stats.rx_packets++; | 100 | skb->dev->stats.rx_packets++; |
| 102 | skb->dev->stats.rx_bytes += skb->len; | 101 | skb->dev->stats.rx_bytes += skb->len; |
| 103 | 102 | ||
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index a91ef8475467..3dd58b594f6a 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
| @@ -533,8 +533,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
| 533 | } | 533 | } |
| 534 | #endif | 534 | #endif |
| 535 | 535 | ||
| 536 | dev->last_rx = jiffies; | ||
| 537 | |||
| 538 | #ifdef NOT_YET | 536 | #ifdef NOT_YET |
| 539 | if ((ieee->iw_mode == IW_MODE_MASTER || | 537 | if ((ieee->iw_mode == IW_MODE_MASTER || |
| 540 | ieee->iw_mode == IW_MODE_REPEAT) && !from_assoc_ap) { | 538 | ieee->iw_mode == IW_MODE_REPEAT) && !from_assoc_ap) { |
