Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[~andy/linux] / drivers / net / bonding / bond_main.c

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f9e0c8bbfa41e91915eb05e3172257652cad9f9c..a7db819bca9278356598152060c4684bd6f615c7 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1700,7 +1700,7 @@ static int __bond_release_one(struct net_device *bond_dev,
        }
 
        if (all) {
-               rcu_assign_pointer(bond->curr_active_slave, NULL);
+               RCU_INIT_POINTER(bond->curr_active_slave, NULL);
        } else if (oldcurrent == slave) {
                /*
                 * Note that we hold RTNL over this sequence, so there