diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-06-23 05:28:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-24 05:40:55 -0700 |
| commit | 1ea2d020ba477cb7011a7174e8501a9e04a325d4 (patch) | |
| tree | 2e32130a1c69c146ee95171dd601f2fcf891f3eb /net/bridge/br_fdb.c | |
| parent | 9aa66382163e784acac0ce3580ed202d9a56d1ac (diff) | |
| download | linux-1ea2d020ba477cb7011a7174e8501a9e04a325d4.tar.bz2 | |
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_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index be84b7e5a3da..9e9875da0a4f 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -330,9 +330,11 @@ void br_fdb_flush(struct net_bridge *br) /* Flush all entries referring to a specific port. * if do_all is set also flush static entries + * if vid is set delete all entries that match the vlan_id */ void br_fdb_delete_by_port(struct net_bridge *br, const struct net_bridge_port *p, + u16 vid, int do_all) { int i; @@ -347,8 +349,9 @@ void br_fdb_delete_by_port(struct net_bridge *br, if (f->dst != p) continue; - if (f->is_static && !do_all) - continue; + if (!do_all) + if (f->is_static || (vid && f->vlan_id != vid)) + continue; if (f->is_local) fdb_delete_local(br, p, f); |