net: bridge: fdb: add ndo_fdb_del_bulk

Add a minimal ndo_fdb_del_bulk implementation which flushes all entries.
Support for more fine-grained filtering will be added in the following
patches.

Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 8d6bab244c4af2d17c8320642e1a5a12d307c574..58a4f70e01e360f44f5599e637ac388c60dd01fc 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -465,6 +465,7 @@ static const struct net_device_ops br_netdev_ops = {
        .ndo_fix_features        = br_fix_features,
        .ndo_fdb_add             = br_fdb_add,
        .ndo_fdb_del             = br_fdb_delete,
+       .ndo_fdb_del_bulk        = br_fdb_delete_bulk,
        .ndo_fdb_dump            = br_fdb_dump,
        .ndo_fdb_get             = br_fdb_get,
        .ndo_bridge_getlink      = br_getlink,

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 6ccda68bd473b464afd000f4f6b521c8a2ef9e6d..363985f1a540dd87f7a7847f70325b253ac713bd 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -572,6 +572,29 @@ void br_fdb_flush(struct net_bridge *br)
        spin_unlock_bh(&br->hash_lock);
 }
 
+int br_fdb_delete_bulk(struct ndmsg *ndm, struct nlattr *tb[],
+                      struct net_device *dev, u16 vid,
+                      struct netlink_ext_ack *extack)
+{
+       struct net_bridge_port *p = NULL;
+       struct net_bridge *br;
+
+       if (netif_is_bridge_master(dev)) {
+               br = netdev_priv(dev);
+       } else {
+               p = br_port_get_rtnl(dev);
+               if (!p) {
+                       NL_SET_ERR_MSG_MOD(extack, "Device is not a bridge port");
+                       return -EINVAL;
+               }
+               br = p->br;
+       }
+
+       br_fdb_flush(br);
+
+       return 0;
+}
+
 /* 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

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 18ccc3d5d296387766bc2b9f06cd9623663ed3a0..6df4473de81bb34e77da6ff242ffc5c122f74501 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -781,6 +781,9 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
 
 int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
                  struct net_device *dev, const unsigned char *addr, u16 vid);
+int br_fdb_delete_bulk(struct ndmsg *ndm, struct nlattr *tb[],
+                      struct net_device *dev, u16 vid,
+                      struct netlink_ext_ack *extack);
 int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev,
               const unsigned char *addr, u16 vid, u16 nlh_flags,
               struct netlink_ext_ack *extack);