bridge: Take per-{Port, VLAN} neighbor suppression into account

The bridge driver gates the neighbor suppression code behind an internal
per-bridge flag called 'BROPT_NEIGH_SUPPRESS_ENABLED'. The flag is set
when at least one bridge port has neighbor suppression enabled.

As a preparation for per-{Port, VLAN} neighbor suppression, make sure
the global flag is also set if per-{Port, VLAN} neighbor suppression is
enabled. That is, when the 'BR_NEIGH_VLAN_SUPPRESS' flag is set on at
least one bridge port.

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_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c
index b45c00c01dea195cf41beb069fa20a883926c9d3..016a25a9e444053e069ed15c95c4e86d6b1c60e9 100644 (file)
--- a/net/bridge/br_arp_nd_proxy.c
+++ b/net/bridge/br_arp_nd_proxy.c
@@ -30,7 +30,7 @@ void br_recalculate_neigh_suppress_enabled(struct net_bridge *br)
        bool neigh_suppress = false;
 
        list_for_each_entry(p, &br->port_list, list) {
-               if (p->flags & BR_NEIGH_SUPPRESS) {
+               if (p->flags & (BR_NEIGH_SUPPRESS | BR_NEIGH_VLAN_SUPPRESS)) {
                        neigh_suppress = true;
                        break;
                }

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 24f01ff113f0e8cff23c8559819047ae840028a3..3f04b40f605686629c32ae181a190987f6166aab 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -759,7 +759,7 @@ void br_port_flags_change(struct net_bridge_port *p, unsigned long mask)
        if (mask & BR_AUTO_MASK)
                nbp_update_port_count(br);
 
-       if (mask & BR_NEIGH_SUPPRESS)
+       if (mask & (BR_NEIGH_SUPPRESS | BR_NEIGH_VLAN_SUPPRESS))
                br_recalculate_neigh_suppress_enabled(br);
 }