diff options
author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-06-23 14:28:16 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-24 14:40:55 +0200 |
commit | 1ea2d020ba477cb7011a7174e8501a9e04a325d4 (patch) | |
tree | 2e32130a1c69c146ee95171dd601f2fcf891f3eb /net/bridge/br_stp_if.c | |
parent | bridge: multicast: add a comment to br_port_state_selection about blocking state (diff) | |
download | linux-1ea2d020ba477cb7011a7174e8501a9e04a325d4.tar.xz linux-1ea2d020ba477cb7011a7174e8501a9e04a325d4.zip |
bridge: vlan: flush the dynamically learned entries on port vlan delete
Add a new argument to br_fdb_delete_by_port which allows to specify a
vid to match when flushing entries and use it in nbp_vlan_delete() to
flush the dynamically learned entries of the vlan/port pair when removing
a vlan from a port. Before this patch only the local mac was being
removed and the dynamically learned ones were left to expire.
Note that the do_all argument is still respected and if specified, the
vid will be ignored.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_stp_if.c')
-rw-r--r-- | net/bridge/br_stp_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 7832d07f48f6..a2730e7196cd 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -111,7 +111,7 @@ void br_stp_disable_port(struct net_bridge_port *p) del_timer(&p->forward_delay_timer); del_timer(&p->hold_timer); - br_fdb_delete_by_port(br, p, 0); + br_fdb_delete_by_port(br, p, 0, 0); br_multicast_disable_port(p); br_configuration_update(br); |