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

net: bridge: rename fdb_insert to fdb_add_local 



fdb_insert() is not a descriptive name for this function, and also easy
to confuse with __br_fdb_add(), fdb_add_entry(), br_fdb_update().
Even more confusingly, it is not even related in any way with those
functions, neither one calls the other.

Since fdb_insert() basically deals with the creation of a BR_FDB_LOCAL
entry and is called only from functions where that is the intention:

- br_fdb_changeaddr
- br_fdb_change_mac_address
- br_fdb_insert

then rename it to fdb_add_local(), because its removal counterpart is
called fdb_delete_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 5f94a5e2

net/bridge/br_fdb.c

+7 −7
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br, 
	return fdb;

}



static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,

static int fdb_add_local(struct net_bridge *br, struct net_bridge_port *source,

			 const unsigned char *addr, u16 vid)

{

	struct net_bridge_fdb_entry *fdb;
@@ -458,7 +458,7 @@ void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr) 


insert:

	/* insert new address,  may fail if invalid address or dup. */

	fdb_insert(br, p, newaddr, 0);

	fdb_add_local(br, p, newaddr, 0);



	if (!vg || !vg->num_vlans)

		goto done;
@@ -468,7 +468,7 @@ void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr) 
	 * from under us.

	 */

	list_for_each_entry(v, &vg->vlan_list, vlist)

		fdb_insert(br, p, newaddr, v->vid);

		fdb_add_local(br, p, newaddr, v->vid);



done:

	spin_unlock_bh(&br->hash_lock);
@@ -488,7 +488,7 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr) 
	    !f->dst && !test_bit(BR_FDB_ADDED_BY_USER, &f->flags))

		fdb_delete_local(br, NULL, f);



	fdb_insert(br, NULL, newaddr, 0);

	fdb_add_local(br, NULL, newaddr, 0);

	vg = br_vlan_group(br);

	if (!vg || !vg->num_vlans)

		goto out;
@@ -503,7 +503,7 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr) 
		if (f && test_bit(BR_FDB_LOCAL, &f->flags) &&

		    !f->dst && !test_bit(BR_FDB_ADDED_BY_USER, &f->flags))

			fdb_delete_local(br, NULL, f);

		fdb_insert(br, NULL, newaddr, v->vid);

		fdb_add_local(br, NULL, newaddr, v->vid);

	}

out:

	spin_unlock_bh(&br->hash_lock);
@@ -685,7 +685,7 @@ int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source, 
	int ret;



	spin_lock_bh(&br->hash_lock);

	ret = fdb_insert(br, source, addr, vid);

	ret = fdb_add_local(br, source, addr, vid);

	spin_unlock_bh(&br->hash_lock);

	return ret;

}