Commit f6814fdc authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4731b6d6

net/bridge/br_fdb.c

+2 −2
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ 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,

int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,

		     const unsigned char *addr, u16 vid)

{

	int ret;

net/bridge/br_if.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

net/bridge/br_private.h

+2 −2
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ 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,

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);

net/bridge/br_vlan.c

+2 −3
Original line number Diff line number Diff line
@@ -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;