Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 4a37161027899ab12d0f2dd5f4c5d69a1ed98716..5fee2feaf292fa76562a6e62ef2f29cb776d7b0c 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -241,6 +241,34 @@ bool br_allowed_egress(struct net_bridge *br,
        return false;
 }
 
+/* Called under RCU */
+bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid)
+{
+       struct net_bridge *br = p->br;
+       struct net_port_vlans *v;
+
+       if (!br->vlan_enabled)
+               return true;
+
+       v = rcu_dereference(p->vlan_info);
+       if (!v)
+               return false;
+
+       br_vlan_get_tag(skb, vid);
+       if (!*vid) {
+               *vid = br_get_pvid(v);
+               if (*vid == VLAN_N_VID)
+                       return false;
+
+               return true;
+       }
+
+       if (test_bit(*vid, v->vlan_bitmap))
+               return true;
+
+       return false;
+}
+
 /* Must be protected by RTNL.
  * Must be called with vid in range from 1 to 4094 inclusive.
  */