Skip to content

Commit 3a83c2a

Browse files
Arkadi Sharshevskydavem330
authored andcommitted
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 <[email protected]> Reviewed-by: Vivien Didelot <[email protected]> Reviewed-by: Ivan Vecera <[email protected]> Acked-by: Jiri Pirko <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2bedde1 commit 3a83c2a

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

net/bridge/br_fdb.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -169,29 +169,11 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
169169
}
170170
}
171171

172-
static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
173-
{
174-
struct switchdev_obj_port_fdb fdb = {
175-
.obj = {
176-
.orig_dev = f->dst->dev,
177-
.id = SWITCHDEV_OBJ_ID_PORT_FDB,
178-
.flags = SWITCHDEV_F_DEFER,
179-
},
180-
.vid = f->vlan_id,
181-
};
182-
183-
ether_addr_copy(fdb.addr, f->addr.addr);
184-
switchdev_port_obj_del(f->dst->dev, &fdb.obj);
185-
}
186-
187172
static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
188173
{
189174
if (f->is_static)
190175
fdb_del_hw_addr(br, f->addr.addr);
191176

192-
if (f->added_by_external_learn)
193-
fdb_del_external_learn(f);
194-
195177
hlist_del_init_rcu(&f->hlist);
196178
fdb_notify(br, f, RTM_DELNEIGH);
197179
call_rcu(&f->rcu, fdb_rcu_free);

0 commit comments

Comments
 (0)