summaryrefslogtreecommitdiff
path: root/net/8021q
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2012-10-02 10:14:17 +0400
committerDavid S. Miller <davem@davemloft.net>2012-10-03 06:45:57 +0400
commit5316cf9a5197eb80b2800e1acadde287924ca975 (patch)
tree1a36086347433ad7205d996cdd2713f28dc51933 /net/8021q
parent786fdf0bbf1c3a1b402bb2da946b93e0b36a8f32 (diff)
downloadlinux-5316cf9a5197eb80b2800e1acadde287924ca975.tar.xz
8021q: fix mac_len recomputation in vlan_untag()
skb_reset_mac_len() relies on the value of the skb->network_header pointer, therefore we must wait for such pointer to be recalculated before computing the new mac_len value. Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index b258da88f675..add69d0fd99d 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -105,7 +105,6 @@ static struct sk_buff *vlan_reorder_header(struct sk_buff *skb)
return NULL;
memmove(skb->data - ETH_HLEN, skb->data - VLAN_ETH_HLEN, 2 * ETH_ALEN);
skb->mac_header += VLAN_HLEN;
- skb_reset_mac_len(skb);
return skb;
}
@@ -139,6 +138,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb)
skb_reset_network_header(skb);
skb_reset_transport_header(skb);
+ skb_reset_mac_len(skb);
+
return skb;
err_free: