Commit 0b148def authored Jun 07, 2016 by Toshiaki Makita Committed by David S. Miller Jun 08, 2016

bridge: Don't insert unnecessary local fdb entry on changing mac address



The missing br_vlan_should_use() test caused creation of an unneeded
local fdb entry on changing mac address of a bridge device when there is
a vlan which is configured on a bridge port but not on the bridge
device.

Fixes: 2594e906 ("bridge: vlan: add per-vlan struct and move to rhashtables")
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 32565644

net/bridge/br_fdb.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -279,6 +279,8 @@ void br_fdb_change_mac_address(struct net_bridge br, const u8 newaddr)
		* change from under us.
		*/
		list_for_each_entry(v, &vg->vlan_list, vlist) {
		if (!br_vlan_should_use(v))
		continue;
		f = __br_fdb_get(br, br->dev->dev_addr, v->vid);
		if (f && f->is_local && !f->dst)
		fdb_delete_local(br, NULL, f);