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>

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index be84b7e5a3da79cb87c41f6d086e08ce0a76967e..9e9875da0a4f979c5389f616b432d218b19fd776 100644 (file)
--- 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);

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 1849d96b3c91d82e20f85ca2579546857343d0f2..a538cb1199a3087673790272b61c57a1f2630651 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -249,7 +249,7 @@ static void del_nbp(struct net_bridge_port *p)
        list_del_rcu(&p->list);
 
        nbp_vlan_flush(p);
-       br_fdb_delete_by_port(br, p, 1);
+       br_fdb_delete_by_port(br, p, 0, 1);
        nbp_update_port_count(br);
 
        netdev_upper_dev_unlink(dev, br->dev);
@@ -278,7 +278,7 @@ void br_dev_delete(struct net_device *dev, struct list_head *head)
                del_nbp(p);
        }
 
-       br_fdb_delete_by_port(br, NULL, 1);
+       br_fdb_delete_by_port(br, NULL, 0, 1);
 
        br_vlan_flush(br);
        del_timer_sync(&br->gc_timer);

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 5dccced712695f8badb380f311ce89f8316b6f79..8b21146b24a055652be0c7d74fd875ed875da918 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -387,7 +387,7 @@ void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr);
 void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr);
 void br_fdb_cleanup(unsigned long arg);
 void br_fdb_delete_by_port(struct net_bridge *br,
-                          const struct net_bridge_port *p, int do_all);
+                          const struct net_bridge_port *p, u16 vid, int do_all);
 struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
                                          const unsigned char *addr, __u16 vid);
 int br_fdb_test_addr(struct net_device *dev, unsigned char *addr);

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 7832d07f48f66c86e4787364d1de86a189b5c842..a2730e7196cd7080b96a441f5cc40591320862e5 100644 (file)
--- 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);

diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 4905845a94e92f125accc4d1a4cf16689fcd3990..efe415ad842a4fad159fb24590d11f6308a88f83 100644 (file)
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -160,7 +160,7 @@ static BRPORT_ATTR(hold_timer, S_IRUGO, show_hold_timer, NULL);
 
 static int store_flush(struct net_bridge_port *p, unsigned long v)
 {
-       br_fdb_delete_by_port(p->br, p, 0); // Don't delete local entry
+       br_fdb_delete_by_port(p->br, p, 0, 0); // Don't delete local entry
        return 0;
 }
 static BRPORT_ATTR(flush, S_IWUSR, NULL, store_flush);

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 574feea6a8cca6fbc9ee65f7663fcece2b2fce87..0d41f81838ff95f8d6ff34246abda0ac3df1f5a2 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -741,6 +741,7 @@ int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)
                return -EINVAL;
 
        br_fdb_find_delete_local(port->br, port, port->dev->dev_addr, vid);
+       br_fdb_delete_by_port(port->br, port, vid, 0);
 
        return __vlan_del(pv, vid);
 }