From 4d1c6716174560bde6678ef04e18fd5a6dbdcd4a Mon Sep 17 00:00:00 2001
From: Joonwoo Park <joonwpark81@gmail.com>
Date: Thu, 29 Nov 2007 22:16:41 +1100
Subject: [PATCH] --- yaml --- r: 74494 b: refs/heads/master c:
 6ab3b487db77fa98a24560f11a5a8e744b98d877 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/8021q/vlan_dev.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bc8d256fb601..c3955f7761d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dde655c9df02ee07ed090dfdb7ae8741bf299e14
+refs/heads/master: 6ab3b487db77fa98a24560f11a5a8e744b98d877
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
index 7a36878241da..4f99bb86af5c 100644
--- a/trunk/net/8021q/vlan_dev.c
+++ b/trunk/net/8021q/vlan_dev.c
@@ -462,7 +462,8 @@ int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	 * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
 	 */
 
-	if (veth->h_vlan_proto != htons(ETH_P_8021Q)) {
+	if (veth->h_vlan_proto != htons(ETH_P_8021Q) ||
+		VLAN_DEV_INFO(dev)->flags & VLAN_FLAG_REORDER_HDR) {
 		int orig_headroom = skb_headroom(skb);
 		unsigned short veth_TCI;