diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:27:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:27:52 +0100 |
| commit | 28c878cf65b7d8a770af2e87933da3e63897e48f (patch) | |
| tree | 22e1350794b8ee72c4d67a116c2675261b42db52 /drivers/net/bonding/bond_options.c | |
| parent | e7a3b8c9ec4c4901094ed7659ba7f62a6811f3c9 (diff) | |
| parent | 8900747f49c2a7f38239abe710de4a1d1d275591 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.06-rt
Diffstat (limited to 'drivers/net/bonding/bond_options.c')
| -rw-r--r-- | drivers/net/bonding/bond_options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 577e57cad1dc..473da3bf10c6 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -1114,6 +1114,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; } |