bridge: Pass VLAN ID to br_flood()

Subsequent patches are going to add per-{Port, VLAN} neighbor
suppression, which will require br_flood() to potentially suppress ARP /
NS packets on a per-{Port, VLAN} basis.

As a preparation, pass the VLAN ID of the packet as another argument to
br_flood().

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index df47c876230ee5c20f2b159557bd257b61702aa4..8eca8a5c80c6ae2909d17560b0c968156625ddf9 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -80,10 +80,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
 
        dest = eth_hdr(skb)->h_dest;
        if (is_broadcast_ether_addr(dest)) {
-               br_flood(br, skb, BR_PKT_BROADCAST, false, true);
+               br_flood(br, skb, BR_PKT_BROADCAST, false, true, vid);
        } else if (is_multicast_ether_addr(dest)) {
                if (unlikely(netpoll_tx_running(dev))) {
-                       br_flood(br, skb, BR_PKT_MULTICAST, false, true);
+                       br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid);
                        goto out;
                }
                if (br_multicast_rcv(&brmctx, &pmctx_null, vlan, skb, vid)) {
@@ -96,11 +96,11 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
                    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst))
                        br_multicast_flood(mdst, skb, brmctx, false, true);
                else
-                       br_flood(br, skb, BR_PKT_MULTICAST, false, true);
+                       br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid);
        } else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) {
                br_forward(dst->dst, skb, false, true);
        } else {
-               br_flood(br, skb, BR_PKT_UNICAST, false, true);
+               br_flood(br, skb, BR_PKT_UNICAST, false, true, vid);
        }
 out:
        rcu_read_unlock();

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 0fe133fa214c797729216577b0d27919e38e5a86..94a8d757ae4edb00b20d1a5fa0cff7cadb47baf4 100644 (file)
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -197,7 +197,8 @@ out:
 
 /* called under rcu_read_lock */
 void br_flood(struct net_bridge *br, struct sk_buff *skb,
-             enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
+             enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,
+             u16 vid)
 {
        struct net_bridge_port *prev = NULL;
        struct net_bridge_port *p;

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 3027e8f6be15bf033e725bbca02e5ffc2b6eab8f..fc17b9fd93e6e9138283ad8bab5792befddb5adb 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -207,7 +207,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
                br_forward(dst->dst, skb, local_rcv, false);
        } else {
                if (!mcast_hit)
-                       br_flood(br, skb, pkt_type, local_rcv, false);
+                       br_flood(br, skb, pkt_type, local_rcv, false, vid);
                else
                        br_multicast_flood(mdst, skb, brmctx, local_rcv, false);
        }

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 7264fd40f82f6783ad578dc526a0f152ad0d9cd1..1ff4d64ab584904ef74266be099248a39557d6e3 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -849,7 +849,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
                bool local_rcv, bool local_orig);
 int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
 void br_flood(struct net_bridge *br, struct sk_buff *skb,
-             enum br_pkt_type pkt_type, bool local_rcv, bool local_orig);
+             enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,
+             u16 vid);
 
 /* return true if both source port and dest port are isolated */
 static inline bool br_skb_isolated(const struct net_bridge_port *to,