hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Vladimir Oltean 2021-10-26 17:27:39 +03:00 committed by David S. Miller
parent 4731b6d6b2
commit f6814fdcfe
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/bridge/br_fdb.c
View File

@ -679,8 +679,8 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,
} }
/* Add entry for local address of interface */ /* Add entry for local address of interface */
int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source, int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,
const unsigned char *addr, u16 vid) const unsigned char *addr, u16 vid)
{ {
int ret; int ret;

2
net/bridge/br_if.c
View File

@ -670,7 +670,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
else else
netdev_set_rx_headroom(dev, br_hr); 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"); netdev_err(dev, "failed insert local address bridge forwarding table\n");
if (br->dev->addr_assign_type != NET_ADDR_SET) { if (br->dev->addr_assign_type != NET_ADDR_SET) {

4
net/bridge/br_private.h
View File

@ -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_test_addr(struct net_device *dev, unsigned char *addr);
int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count, int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count,
unsigned long off); unsigned long off);
int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source, int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,
const unsigned char *addr, u16 vid); const unsigned char *addr, u16 vid);
void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
const unsigned char *addr, u16 vid, unsigned long flags); const unsigned char *addr, u16 vid, unsigned long flags);

5
net/bridge/br_vlan.c
View File

@ -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 */ /* Add the dev mac and count the vlan only if it's usable */
if (br_vlan_should_use(v)) { 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) { if (err) {
br_err(br, "failed insert local address into bridge forwarding table\n"); br_err(br, "failed insert local address into bridge forwarding table\n");
goto out_filt; goto out_filt;
@ -683,8 +683,7 @@ static int br_vlan_add_existing(struct net_bridge *br,
goto err_flags; goto err_flags;
} }
/* It was only kept for port vlans, now make it real */ /* It was only kept for port vlans, now make it real */
err = br_fdb_insert(br, NULL, br->dev->dev_addr, err = br_fdb_add_local(br, NULL, br->dev->dev_addr, vlan->vid);
vlan->vid);
if (err) { if (err) {
br_err(br, "failed to insert local address into bridge forwarding table\n"); br_err(br, "failed to insert local address into bridge forwarding table\n");
goto err_fdb_insert; goto err_fdb_insert;