From 884786823e70a2ebe538e70abb0833a5f6c719eb Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 29 Oct 2011 06:13:39 +0000
Subject: [PATCH] --- yaml --- r: 271632 b: refs/heads/master c:
 6a32e4f9dd9219261f8856f817e6655114cfec2f h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/if_vlan.h | 6 +++---
 trunk/net/8021q/vlan_core.c   | 7 +++++--
 trunk/net/core/dev.c          | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c2e62e14e8dc..c6f9f1782571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14ef37b6d00eb5d06704e45989ba4c21e7be7673
+refs/heads/master: 6a32e4f9dd9219261f8856f817e6655114cfec2f
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
index 44da4822bcab..12d5543b14f2 100644
--- a/trunk/include/linux/if_vlan.h
+++ b/trunk/include/linux/if_vlan.h
@@ -106,7 +106,7 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,
 extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);
 extern u16 vlan_dev_vlan_id(const struct net_device *dev);
 
-extern bool vlan_do_receive(struct sk_buff **skb);
+extern bool vlan_do_receive(struct sk_buff **skb, bool last_handler);
 extern struct sk_buff *vlan_untag(struct sk_buff *skb);
 
 #else
@@ -128,9 +128,9 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev)
 	return 0;
 }
 
-static inline bool vlan_do_receive(struct sk_buff **skb)
+static inline bool vlan_do_receive(struct sk_buff **skb, bool last_handler)
 {
-	if ((*skb)->vlan_tci & VLAN_VID_MASK)
+	if (((*skb)->vlan_tci & VLAN_VID_MASK) && last_handler)
 		(*skb)->pkt_type = PACKET_OTHERHOST;
 	return false;
 }
diff --git a/trunk/net/8021q/vlan_core.c b/trunk/net/8021q/vlan_core.c
index f1f2f7bb6661..163397f1fd5a 100644
--- a/trunk/net/8021q/vlan_core.c
+++ b/trunk/net/8021q/vlan_core.c
@@ -4,7 +4,7 @@
 #include <linux/netpoll.h>
 #include "vlan.h"
 
-bool vlan_do_receive(struct sk_buff **skbp)
+bool vlan_do_receive(struct sk_buff **skbp, bool last_handler)
 {
 	struct sk_buff *skb = *skbp;
 	u16 vlan_id = skb->vlan_tci & VLAN_VID_MASK;
@@ -13,7 +13,10 @@ bool vlan_do_receive(struct sk_buff **skbp)
 
 	vlan_dev = vlan_find_dev(skb->dev, vlan_id);
 	if (!vlan_dev) {
-		if (vlan_id)
+		/* Only the last call to vlan_do_receive() should change
+		 * pkt_type to PACKET_OTHERHOST
+		 */
+		if (vlan_id && last_handler)
 			skb->pkt_type = PACKET_OTHERHOST;
 		return false;
 	}
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index edcf019c056d..6ba50a1e404c 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -3283,18 +3283,18 @@ static int __netif_receive_skb(struct sk_buff *skb)
 ncls:
 #endif
 
+	rx_handler = rcu_dereference(skb->dev->rx_handler);
 	if (vlan_tx_tag_present(skb)) {
 		if (pt_prev) {
 			ret = deliver_skb(skb, pt_prev, orig_dev);
 			pt_prev = NULL;
 		}
-		if (vlan_do_receive(&skb))
+		if (vlan_do_receive(&skb, !rx_handler))
 			goto another_round;
 		else if (unlikely(!skb))
 			goto out;
 	}
 
-	rx_handler = rcu_dereference(skb->dev->rx_handler);
 	if (rx_handler) {
 		if (pt_prev) {
 			ret = deliver_skb(skb, pt_prev, orig_dev);