X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=net%2F8021q%2Fvlan_core.c;h=e2ed69850489bb79a6a055ee3264456a31acee3e;hb=86eaf54d07f239243f674d6256e5c4be6578348a;hp=496b27588493ded6edb0bf408440ecaa56dcd59c;hpb=f2115faaf0df42623638dfbfc5bdaab6ef7375ab;p=firefly-linux-kernel-4.4.55.git

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 496b27588493..e2ed69850489 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -30,7 +30,9 @@ bool vlan_do_receive(struct sk_buff **skbp)
 			skb->pkt_type = PACKET_HOST;
 	}
 
-	if (!(vlan_dev_priv(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR)) {
+	if (!(vlan_dev_priv(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR) &&
+	    !netif_is_macvlan_port(vlan_dev) &&
+	    !netif_is_bridge_port(vlan_dev)) {
 		unsigned int offset = skb->data - skb_mac_header(skb);
 
 		/*