diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-04 01:01:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-04 01:01:07 -0500 |
commit | d2ad3ca88da02baeccd5216780f1fe983c6953ba (patch) | |
tree | 62858c1c1f89cf4abe17f5e4e0812b1b528fbd18 /net/8021q | |
parent | 265eb67fb4e16be8e46a51e1e4e2ecd99fb15219 (diff) |
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 <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlan_core.c | 1 | ||||
-rw-r--r-- | net/8021q/vlan_dev.c | 2 |
2 files changed, 0 insertions, 3 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; |