From 5a3d700c2c62c9720405226aa35bd4937b4cf414 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Wed, 18 Feb 2009 23:31:11 -0800
Subject: [PATCH] --- yaml --- r: 131695 b: refs/heads/master c:
 e4dd61882e2cfe47ea72ecd825671e8e5ae29038 h: refs/heads/master i:   131693:
 0246fedde525f8342bda1acb3c544b2ab3c02770   131691:
 69f66e3c4795aa218c2499ad20374d57897e969c   131687:
 6d15e7c61d567befc860963dda5b188e30b3bc83   131679:
 323eeaf9275ee79705317a9aa2fc0abfe4c67afe v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/if_vlan.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f9cf4d60cb9f..dd5e318a95a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce03aaddd4d67371494b36c8e8a57bc789e934d6
+refs/heads/master: e4dd61882e2cfe47ea72ecd825671e8e5ae29038
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
index f8ff918c208f..e1ff5b14310e 100644
--- a/trunk/include/linux/if_vlan.h
+++ b/trunk/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);