diff options
| author |   Ido Schimmel <idosch@mellanox.com> | 2017-05-26 08:37:23 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-26 15:18:44 -0400 |
| commit | 1f51445af35e8477027d87ca015a10257b13f5a2 (patch) | |
| tree | 58b6ad2c8b0ad4410776f23d2ba80877df9b11f4 /net/bridge/br_if.c | |
| parent | Merge branch 'mv88e6xxx-SERDES' (diff) | |
| download | linux-dev-1f51445af35e8477027d87ca015a10257b13f5a2.tar.xz linux-dev-1f51445af35e8477027d87ca015a10257b13f5a2.zip | |
bridge: Export VLAN filtering state
It's useful for drivers supporting bridge offload to be able to query
the bridge's VLAN filtering state.
Currently, upon enslavement to a bridge master, the offloading driver
will only learn about the bridge's VLAN filtering state after the bridge
device was already linked with its slave.
Being able to query the bridge's VLAN filtering state allows such
drivers to forbid enslavement in case resource couldn't be allocated for
a VLAN-aware bridge and also choose the correct initialization routine
for the enslaved port, which is dependent on the bridge type.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/bridge/br_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 7f8d05cf9065..f3aef22931ab 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -138,7 +138,7 @@ void br_manage_promisc(struct net_bridge *br) /* If vlan filtering is disabled or bridge interface is placed * into promiscuous mode, place all ports in promiscuous mode. */ - if ((br->dev->flags & IFF_PROMISC) || !br_vlan_enabled(br)) + if ((br->dev->flags & IFF_PROMISC) || !br_vlan_enabled(br->dev)) set_all = true; list_for_each_entry(p, &br->port_list, list) { |