net: bridge: rename br_fdb_insert to br_fdb_add_local

br_fdb_insert() is a wrapper over fdb_insert() that also takes the
bridge hash_lock.

With fdb_insert() being renamed to fdb_add_local(), rename
br_fdb_insert() to br_fdb_add_local().

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.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 668f87db764470195367bdb2bc2e0c4dcaace23a..09e7a1dd9e3ce99ca094636f3b9c3c0e74948130 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -679,8 +679,8 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,
 }
 
 /* Add entry for local address of interface */
-int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
-                 const unsigned char *addr, u16 vid)
+int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,
+                    const unsigned char *addr, u16 vid)
 {
        int ret;
 

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index c11bba3e7ec098307b9316e1957438a5555f789b..c1183fef1f21f7a4e140c23ac70dfdd279ec933d 100644 (file)
--- 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) {

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 37ca76406f1e8258f1f603df35f4101acf34092a..705606fc22372043e0609d922579b9e345791062 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -767,8 +767,8 @@ struct net_bridge_fdb_entry *br_fdb_find_rcu(struct net_bridge *br,
 int br_fdb_test_addr(struct net_device *dev, unsigned char *addr);
 int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count,
                   unsigned long off);
-int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
-                 const unsigned char *addr, u16 vid);
+int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,
+                    const unsigned char *addr, u16 vid);
 void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                   const unsigned char *addr, u16 vid, unsigned long flags);
 

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 19f65ab91a0273a98766f0c325756407146b4ea5..57bd6ee72a071f8906b1370ad998ed23971fd93d 100644 (file)
--- 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;