8021q: fix mac_len recomputation in vlan_untag()
authorAntonio Quartulli <ordex@autistici.org>
Tue, 2 Oct 2012 06:14:17 +0000 (06:14 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 10 Oct 2012 02:31:28 +0000 (03:31 +0100)
commit92d543ce6d280c7736cd242ee9e6112ebe0050c4
treea94505cf155496ca8afad0b56bbbae901ff0d7c4
parent6e95789b0c1ec39ab7159ec3b2dbcad0af69532e
8021q: fix mac_len recomputation in vlan_untag()

[ Upstream commit 5316cf9a5197eb80b2800e1acadde287924ca975 ]

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/8021q/vlan_core.c