Merge branch 'bonding'

Ding Tianhong says:

====================
bonding: fix primary problem for bonding

If the slave's name changed, and the bond params primary is exist,
the bond should deal with the situation in two ways:

1) If the slave was the primary slave yet, clean the primary slave
   and reselect active slave.
2) If the slave's new name is as same as bond primary, set the slave
   as primary slave and reselect active slave.

If the new primary is not matching any slave in the bond, the bond should
record it to params, clean the primary slave and select a new active slave.

Update bonding.txt for primary description.

v2.1->v1: Because there are too many indentions and useless verification, so rewrite
	  the logic for updating the primary slave.
	  Modify some comments for to clean the typos.

v3->v2.1: Veaceslav disagree the first patch and modify the logic for it
	  (bonding: update the primary slave when changing slave's name)
	  and resend it himself (bonding: handle slave's name change with primary_slave logic),
	  so remove the first patch and send the last two patches.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 1 deletions

diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index a4d925e4ba7a..5cdb22971d19 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -657,7 +657,8 @@ primary
         one slave is preferred over another, e.g., when one slave has
         higher throughput than another.
 
-        The primary option is only valid for active-backup mode.
+        The primary option is only valid for active-backup(1),
+        balance-tlb (5) and balance-alb (6) mode.
 
 primary_reselect
 
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 05a402c99bff..4cee04aa6eb3 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -1021,6 +1021,12 @@ int bond_option_primary_set(struct bonding *bond, struct bond_opt_value *newval)
                 }
         }
 
+        if (bond->primary_slave) {
+                pr_info("%s: Setting primary slave to None.\n",
+                        bond->dev->name);
+                bond->primary_slave = NULL;
+                bond_select_active_slave(bond);
+        }
         strncpy(bond->params.primary, primary, IFNAMSIZ);
         bond->params.primary[IFNAMSIZ - 1] = 0;