summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorXiangning Yu <yuxiangning@gmail.com>2018-06-07 13:39:59 +0800
committerDavid S. Miller <davem@davemloft.net>2018-06-07 16:47:10 -0400
commiteb55bbf865d9979098c6a7a17cbdb41237ece951 (patch)
treeea6824ba5019e0eb01ebdcd29e34e300aff0e3ab /drivers/net/bonding
parent000ade8016400d93b4d7c89970d96b8c14773d45 (diff)
downloadlinux-eb55bbf865d9979098c6a7a17cbdb41237ece951.tar.bz2
bonding: re-evaluate force_primary when the primary slave name changes
There is a timing issue under active-standy mode, when bond_enslave() is called, bond->params.primary might not be initialized yet. Any time the primary slave string changes, bond->force_primary should be set to true to make sure the primary becomes the active slave. Signed-off-by: Xiangning Yu <yuxiangning@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_options.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 8a945c9341d6..98663c50ded0 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -1142,6 +1142,7 @@ static int bond_option_primary_set(struct bonding *bond,
slave->dev->name);
rcu_assign_pointer(bond->primary_slave, slave);
strcpy(bond->params.primary, slave->dev->name);
+ bond->force_primary = true;
bond_select_active_slave(bond);
goto out;
}