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_if.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_if.c')
-rw-r--r-- | net/bridge/br_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index c11bba3e7ec0..c1183fef1f21 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -670,7 +670,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, else netdev_set_rx_headroom(dev, br_hr); - if (br_fdb_insert(br, p, dev->dev_addr, 0)) + if (br_fdb_add_local(br, p, dev->dev_addr, 0)) netdev_err(dev, "failed insert local address bridge forwarding table\n"); if (br->dev->addr_assign_type != NET_ADDR_SET) { |