1 files changed, 2 insertions, 1 deletions

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 7a36878241d..4f99bb86af5 100644
--- a/net/8021q/vlan_dev.c
+++ b/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;