bonding: clean the primary slave if there is no slave matching new primary

PATCH NAK Ding Tianhong 1 participant 1 message Jan 14, 2014

Subsystems (3)

Networking Network drivers Bonding driver

lore

Share & tools

lore

Ding Tianhong

author

2014-01-14 10:55 UTC #0 lore raw

PATCH 2/3 bonding: clean the primary slave if there is no slave matching new primary

If the new primay 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.

Signed-off-by Ding Tianhong <[email protected]>

---
 drivers/net/bonding/bond_options.c | 6 ++++++
 1 file changed, 6 insertions(+)

drivers/net/bonding/bond_options.c +6 -0

index 945a666..0ee0bfe 100644
@@ -512,6 +512,12 @@ int bond_option_primary_set(struct bonding *bond, const char *primary)
 		}
 	}
 
+	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;

Signature · 1 line

1.8.0