From: Jarek Poplawski <jarkao2@gmail.com>
Date: Thu, 19 Feb 2009 07:31:11 +0000 (-0800)
Subject: vlan: Update skb->mac_header in __vlan_put_tag().
X-Git-Tag: v2.6.29-rc7~13^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4dd61882e2cfe47ea72ecd825671e8e5ae29038;p=profile%2Fivi%2Fkernel-x86-ivi.git

vlan: Update skb->mac_header in __vlan_put_tag().

After moving mac addresses in __vlan_put_tag() skb->mac_header needs
to be updated.

Reported-by: Karl Hiramoto <karl@hiramoto.org>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index f8ff918..e1ff5b1 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -210,6 +210,7 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
 
 	/* Move the mac addresses to the beginning of the new header. */
 	memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN);
+	skb->mac_header -= VLAN_HLEN;
 
 	/* first, the ethernet type */
 	veth->h_vlan_proto = htons(ETH_P_8021Q);