Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / net / 8021q / vlan_core.c

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index add69d0fd99d2b34025c0d8fb42f703ca6ea38c0..fbbf1fa00940e2c843f1706ea1a6bcfff349c555 100644 (file)
--- 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 last_handler)
+bool vlan_do_receive(struct sk_buff **skbp)
 {
        struct sk_buff *skb = *skbp;
        u16 vlan_id = skb->vlan_tci & VLAN_VID_MASK;
@@ -13,14 +13,8 @@ bool vlan_do_receive(struct sk_buff **skbp, bool last_handler)
        struct vlan_pcpu_stats *rx_stats;
 
        vlan_dev = vlan_find_dev(skb->dev, vlan_id);
-       if (!vlan_dev) {
-               /* 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;
+       if (!vlan_dev)
                return false;
-       }
 
        skb = *skbp = skb_share_check(skb, GFP_ATOMIC);
        if (unlikely(!skb))