net: bridge: Remove FDB deletion through switchdev object

At this point no driver supports FDB add/del through switchdev object
but rather via notification chain, thus, it is removed.

Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Ivan Vecera <ivecera@redhat.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.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 a5e4a736a9840420baa91c429bb0e29ff4d0f904..a79b648aac88ddf67edf612c465e82f5fc2ec289 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -169,29 +169,11 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
        }
 }
 
-static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
-{
-       struct switchdev_obj_port_fdb fdb = {
-               .obj = {
-                       .orig_dev = f->dst->dev,
-                       .id = SWITCHDEV_OBJ_ID_PORT_FDB,
-                       .flags = SWITCHDEV_F_DEFER,
-               },
-               .vid = f->vlan_id,
-       };
-
-       ether_addr_copy(fdb.addr, f->addr.addr);
-       switchdev_port_obj_del(f->dst->dev, &fdb.obj);
-}
-
 static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
 {
        if (f->is_static)
                fdb_del_hw_addr(br, f->addr.addr);
 
-       if (f->added_by_external_learn)
-               fdb_del_external_learn(f);
-
        hlist_del_init_rcu(&f->hlist);
        fdb_notify(br, f, RTM_DELNEIGH);
        call_rcu(&f->rcu, fdb_rcu_free);