2 files changed, 11 insertions, 6 deletions

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 1f64cc9da1b0..f5ffc02729d6 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -5,7 +5,7 @@
 #include <linux/export.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;
@@ -14,7 +14,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/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index c8cf9391417e..bc2528624583 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -470,10 +470,12 @@ static void vlan_dev_change_rx_flags(struct net_device *dev, int change)
 {
         struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
 
-        if (change & IFF_ALLMULTI)
-                dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1);
-        if (change & IFF_PROMISC)
-                dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1);
+        if (dev->flags & IFF_UP) {
+                if (change & IFF_ALLMULTI)
+                        dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1);
+                if (change & IFF_PROMISC)
+                        dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1);
+        }
 }
 
 static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)