Correct .gbs.conf settings

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index f23c74b..e1bd253 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -125,7 +125,8 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br,
 {
        u16 vid;
 
-       if (!br->vlan_enabled)
+       /* If this packet was not filtered at input, let it pass */
+       if (!BR_INPUT_SKB_CB(skb)->vlan_filtered)
                goto out;
 
        /* Vlan filter table must be configured at this point.  The
@@ -163,14 +164,18 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
        /* If VLAN filtering is disabled on the bridge, all packets are
         * permitted.
         */
-       if (!br->vlan_enabled)
+       if (!br->vlan_enabled) {
+               BR_INPUT_SKB_CB(skb)->vlan_filtered = false;
                return true;
+       }
 
        /* If there are no vlan in the permitted list, all packets are
         * rejected.
         */
        if (!v)
-               return false;
+               goto drop;
+
+       BR_INPUT_SKB_CB(skb)->vlan_filtered = true;
 
        /* If vlan tx offload is disabled on bridge device and frame was
         * sent from vlan device on the bridge device, it does not have
@@ -179,7 +184,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
        if (unlikely(!vlan_tx_tag_present(skb) &&
                     (skb->protocol == htons(ETH_P_8021Q) ||
                      skb->protocol == htons(ETH_P_8021AD)))) {
-               skb = vlan_untag(skb);
+               skb = skb_vlan_untag(skb);
                if (unlikely(!skb))
                        return false;
        }
@@ -193,7 +198,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
                 * vlan untagged or priority-tagged traffic belongs to.
                 */
                if (pvid == VLAN_N_VID)
-                       return false;
+                       goto drop;
 
                /* PVID is set on this port.  Any untagged or priority-tagged
                 * ingress frame is considered to belong to this vlan.
@@ -216,7 +221,8 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
        /* Frame had a valid vlan tag.  See if vlan is allowed */
        if (test_bit(*vid, v->vlan_bitmap))
                return true;
-
+drop:
+       kfree_skb(skb);
        return false;
 }
 
@@ -227,7 +233,8 @@ bool br_allowed_egress(struct net_bridge *br,
 {
        u16 vid;
 
-       if (!br->vlan_enabled)
+       /* If this packet was not filtered at input, let it pass */
+       if (!BR_INPUT_SKB_CB(skb)->vlan_filtered)
                return true;
 
        if (!v)
@@ -240,6 +247,35 @@ 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 filtering was disabled at input, let it pass. */
+       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.
  */