diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-27 15:54:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-27 15:54:02 +0200 |
| commit | 6487c819393ed1678ef847fd260ea86edccc0bb3 (patch) | |
| tree | 49440eaf875e1aa36de3dca0df5d0b511841a4c4 /net/bridge/br_vlan.c | |
| parent | Merge branch 'mvneta-phylink' (diff) | |
| parent | net: switchdev: merge switchdev_handle_fdb_{add,del}_to_device (diff) | |
| download | linux-6487c819393ed1678ef847fd260ea86edccc0bb3.tar.xz linux-6487c819393ed1678ef847fd260ea86edccc0bb3.zip | |
Merge branch 'br-fdb-refactoring'
Vladimir Oltean says:
====================
Bridge FDB refactoring
This series refactors the br_fdb.c, br_switchdev.c and switchdev.c files
to offer the same level of functionality with a bit less code, and to
clarify the purpose of some functions.
No functional change intended.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_vlan.c')
| -rw-r--r-- | net/bridge/br_vlan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 19f65ab91a02..57bd6ee72a07 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -293,7 +293,7 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags, /* Add the dev mac and count the vlan only if it's usable */ if (br_vlan_should_use(v)) { - err = br_fdb_insert(br, p, dev->dev_addr, v->vid); + err = br_fdb_add_local(br, p, dev->dev_addr, v->vid); if (err) { br_err(br, "failed insert local address into bridge forwarding table\n"); goto out_filt; @@ -683,8 +683,7 @@ static int br_vlan_add_existing(struct net_bridge *br, goto err_flags; } /* It was only kept for port vlans, now make it real */ - err = br_fdb_insert(br, NULL, br->dev->dev_addr, - vlan->vid); + err = br_fdb_add_local(br, NULL, br->dev->dev_addr, vlan->vid); if (err) { br_err(br, "failed to insert local address into bridge forwarding table\n"); goto err_fdb_insert; |