mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
bridge: Fix flushing of dynamic FDB entries
[ Upstream commit628ac04a75
] The following commands should result in all the dynamic FDB entries being flushed, but instead all the non-local (non-permanent) entries are flushed: # bridge fdb add 00:aa:bb:cc:dd:ee dev dummy1 master static # bridge fdb add 00:11:22:33:44:55 dev dummy1 master dynamic # ip link set dev br0 type bridge fdb_flush # bridge fdb show brport dummy1 00:00:00:00:00:01 master br0 permanent 33:33:00:00:00:01 self permanent 01:00:5e:00:00:01 self permanent This is because br_fdb_flush() works with FDB flags and not the corresponding enumerator values. Fix by passing the FDB flag instead. After the fix: # bridge fdb add 00:aa:bb:cc:dd:ee dev dummy1 master static # bridge fdb add 00:11:22:33:44:55 dev dummy1 master dynamic # ip link set dev br0 type bridge fdb_flush # bridge fdb show brport dummy1 00:aa:bb:cc:dd:ee master br0 static 00:00:00:00:00:01 master br0 permanent 33:33:00:00:00:01 self permanent 01:00:5e:00:00:01 self permanent Fixes:1f78ee14ee
("net: bridge: fdb: add support for fine-grained flushing") Signed-off-by: Ido Schimmel <idosch@nvidia.com> Acked-by: Nikolay Aleksandrov <razor@blackwall.org> Link: https://lore.kernel.org/r/20221101185753.2120691-1-idosch@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a99a8ec4c6
commit
02ceee69d0
2 changed files with 2 additions and 2 deletions
|
@ -1332,7 +1332,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
|
|||
|
||||
if (data[IFLA_BR_FDB_FLUSH]) {
|
||||
struct net_bridge_fdb_flush_desc desc = {
|
||||
.flags_mask = BR_FDB_STATIC
|
||||
.flags_mask = BIT(BR_FDB_STATIC)
|
||||
};
|
||||
|
||||
br_fdb_flush(br, &desc);
|
||||
|
|
|
@ -345,7 +345,7 @@ static int set_flush(struct net_bridge *br, unsigned long val,
|
|||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
struct net_bridge_fdb_flush_desc desc = {
|
||||
.flags_mask = BR_FDB_STATIC
|
||||
.flags_mask = BIT(BR_FDB_STATIC)
|
||||
};
|
||||
|
||||
br_fdb_flush(br, &desc);
|
||||
|
|
Loading…
Reference in a new issue