---

yaml --- r: 131695 b: refs/heads/master c: e4dd618 h: refs/heads/master i: 131693: 0246fed 131691: 69f66e3 131687: 6d15e7c 131679: 323eeaf v: v3
git-mirror · Feb 19, 2009 · 5a3d700 · 5a3d700
1 parent 5982afc
commit 5a3d700
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);