Skip to contentSkip to conversation

: net/: Kill now superfluous ->last_rx stores.

PATCH In review David Miller 3 participants 4 messages Nov 4, 2008

Subsystems (4)
Networking Network drivers Bluetooth Networking DSA
lore
Share & tools
lore

David Miller

author maintainer
#0 lore raw

PATCH 1/1 : net/: Kill now superfluous ->last_rx stores.

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 David S. Miller <[email protected]>
---
 net/8021q/vlan_core.c        |    1 -
 net/8021q/vlan_dev.c         |    2 --
 net/bluetooth/bnep/core.c    |    1 -
 net/dsa/tag_dsa.c            |    1 -
 net/dsa/tag_edsa.c           |    1 -
 net/dsa/tag_trailer.c        |    1 -
 net/ieee80211/ieee80211_rx.c |    2 --
 7 files changed, 0 insertions(+), 9 deletions(-)
net/8021q/vlan_core.c +0 -1
index 916061f..118adef 100644
@@ -24,7 +24,6 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
 		 * due to congestion. */
 		return NET_RX_SUCCESS;
 	}
-	skb->dev->last_rx = jiffies;
 	skb->vlan_tci = 0;
 
 	stats = &skb->dev->stats;
net/8021q/vlan_dev.c +0 -2
index c269fcb..e4bf39f 100644
@@ -163,8 +163,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 		goto err_unlock;
 	}
 
-	skb->dev->last_rx = jiffies;
-
 	stats = &skb->dev->stats;
 	stats->rx_packets++;
 	stats->rx_bytes += skb->len;
net/bluetooth/bnep/core.c +0 -1
index 80ba30c..7a4d530 100644
@@ -311,7 +311,6 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 	struct sk_buff *nskb;
 	u8 type;
 
-	dev->last_rx = jiffies;
 	s->stats.rx_bytes += skb->len;
 
 	type = *(u8 *) skb->data; skb_pull(skb, 1);
net/dsa/tag_dsa.c +0 -1
index bdc0510..ff55823 100644
@@ -161,7 +161,6 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev,
 	skb_push(skb, ETH_HLEN);
 	skb->protocol = eth_type_trans(skb, skb->dev);
 
-	skb->dev->last_rx = jiffies;
 	skb->dev->stats.rx_packets++;
 	skb->dev->stats.rx_bytes += skb->len;
net/dsa/tag_edsa.c +0 -1
index f985ea9..24b1c76 100644
@@ -180,7 +180,6 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev,
 	skb_push(skb, ETH_HLEN);
 	skb->protocol = eth_type_trans(skb, skb->dev);
 
-	skb->dev->last_rx = jiffies;
 	skb->dev->stats.rx_packets++;
 	skb->dev->stats.rx_bytes += skb->len;
net/dsa/tag_trailer.c +0 -1
index d311776..3bfd2e5 100644
@@ -97,7 +97,6 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
 	skb_push(skb, ETH_HLEN);
 	skb->protocol = eth_type_trans(skb, skb->dev);
 
-	skb->dev->last_rx = jiffies;
 	skb->dev->stats.rx_packets++;
 	skb->dev->stats.rx_bytes += skb->len;
net/ieee80211/ieee80211_rx.c +0 -2
index a91ef84..3dd58b5 100644
@@ -533,8 +533,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
 	}
 #endif
 
-	dev->last_rx = jiffies;
-
 #ifdef NOT_YET
 	if ((ieee->iw_mode == IW_MODE_MASTER ||
 	     ieee->iw_mode == IW_MODE_REPEAT) && !from_assoc_ap) {
Signature · 1 line
1.5.6.5
author maintainer
#2 lore raw

From: Marcel Holtmann <[email protected]>
Date: Tue, 4 Nov 2008 07:14:59 +0100

Quoted 11 lines
Quoted 7 lines

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 David S. Miller <[email protected]>

just for the sake of it, the Bluetooth part is fine with :)

Acked-by Marcel Holtmann <[email protected]>

Thanks for looking at it Marcel :)