Commit 25e40305 authored Apr 18, 2013 by nikolay@redhat.com Committed by David S. Miller Apr 19, 2013

bonding: mc addresses don't get deleted on enslave failure



Add bond_mc_list_flush() after err_detach as that's the first error path
after the addresses are added. The main issue is the mc addresses' refcount
which only gets bumped up.

v2: update log message and don't move code unnecessarily

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent cb95ec62

drivers/net/bonding/bond_main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1901,6 +1901,11 @@ int bond_enslave(struct net_device bond_dev, struct net_device slave_dev)
		bond_destroy_slave_symlinks(bond_dev, slave_dev);

		err_detach:
		if (!USES_PRIMARY(bond->params.mode)) {
		netif_addr_lock_bh(bond_dev);
		bond_mc_list_flush(bond_dev, slave_dev);
		netif_addr_unlock_bh(bond_dev);
		}
		write_lock_bh(&bond->lock);
		bond_detach_slave(bond, new_slave);
		write_unlock_bh(&bond->lock);