net: replace br_fdb_external_learn_* calls with switchdev notifier events

This patch benefits from newly introduced switchdev notifier and uses it
to propagate fdb learn events from rocker driver to bridge. That avoids
direct function calls and possible use by other listeners (ovs).

Suggested-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 34 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index e6e0372bc3cd..03667e65cc29 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -990,26 +990,14 @@ void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p)
         }
 }
 
-int br_fdb_external_learn_add(struct net_device *dev,
+int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
                               const unsigned char *addr, u16 vid)
 {
-        struct net_bridge_port *p;
-        struct net_bridge *br;
         struct hlist_head *head;
         struct net_bridge_fdb_entry *fdb;
         int err = 0;
 
-        rtnl_lock();
-
-        p = br_port_get_rtnl(dev);
-        if (!p) {
-                pr_info("bridge: %s not a bridge port\n", dev->name);
-                err = -EINVAL;
-                goto err_rtnl_unlock;
-        }
-
-        br = p->br;
-
+        ASSERT_RTNL();
         spin_lock_bh(&br->hash_lock);
 
         head = &br->hash[br_mac_hash(addr, vid)];
@@ -1034,33 +1022,18 @@ int br_fdb_external_learn_add(struct net_device *dev,
 
 err_unlock:
         spin_unlock_bh(&br->hash_lock);
-err_rtnl_unlock:
-        rtnl_unlock();
 
         return err;
 }
-EXPORT_SYMBOL(br_fdb_external_learn_add);
 
-int br_fdb_external_learn_del(struct net_device *dev,
+int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
                               const unsigned char *addr, u16 vid)
 {
-        struct net_bridge_port *p;
-        struct net_bridge *br;
         struct hlist_head *head;
         struct net_bridge_fdb_entry *fdb;
         int err = 0;
 
-        rtnl_lock();
-
-        p = br_port_get_rtnl(dev);
-        if (!p) {
-                pr_info("bridge: %s not a bridge port\n", dev->name);
-                err = -EINVAL;
-                goto err_rtnl_unlock;
-        }
-
-        br = p->br;
-
+        ASSERT_RTNL();
         spin_lock_bh(&br->hash_lock);
 
         head = &br->hash[br_mac_hash(addr, vid)];
@@ -1071,9 +1044,6 @@ int br_fdb_external_learn_del(struct net_device *dev,
                 err = -ENOENT;
 
         spin_unlock_bh(&br->hash_lock);
-err_rtnl_unlock:
-        rtnl_unlock();
 
         return err;
 }
-EXPORT_SYMBOL(br_fdb_external_learn_del);