Commit a3ebb7ef authored Feb 07, 2014 by Toshiaki Makita Committed by David S. Miller Feb 10, 2014

bridge: Fix the way to find old local fdb entries in br_fdb_change_mac_address



We have been always failed to delete the old entry at
br_fdb_change_mac_address() because br_set_mac_address() updates
dev->dev_addr before calling br_fdb_change_mac_address() and
br_fdb_change_mac_address() uses dev->dev_addr to find the old entry.

That update of dev_addr is completely unnecessary because the same work
is done in br_stp_change_bridge_id() which is called right away after
calling br_fdb_change_mac_address().

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2836882f

net/bridge/br_device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,8 +187,8 @@ static int br_set_mac_address(struct net_device dev, void p)

		spin_lock_bh(&br->lock);
		if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) {
		memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
		br_fdb_change_mac_address(br, addr->sa_data);
		/* Mac address will be changed in br_stp_change_bridge_id(). */
		br_stp_change_bridge_id(br, addr->sa_data);
		}
		spin_unlock_bh(&br->lock);

Admin message