bonding: don't set fail_over_mac if the mode is not active backup

PATCH In review Ding Tianhong 1 participant 1 message Jan 21, 2014

Subsystems (3)

Networking Network drivers Bonding driver

lore

Share & tools

lore

Ding Tianhong

author

2014-01-21 09:44 UTC #0 lore raw

PATCH 2/5 bonding: don't set fail_over_mac if the mode is not active backup

The fail_over_mac could be set by sysfs in every mode now, it will cause bonding not to set all slaves to the same MAC address, but in rr, xor, broadcast, lacp mode ,the slaves should have the same MAC address with the master, so don't set the fail_over_mac by sysfs if the mode is not active-backup.

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..0996ab4 100644
@@ -550,6 +550,12 @@ int bond_option_primary_reselect_set(struct bonding *bond, int primary_reselect)
 
 int bond_option_fail_over_mac_set(struct bonding *bond, int fail_over_mac)
 {
+	if (bond->params.mode != BOND_MODE_ACTIVEBACKUP) {
+		pr_err("%s: fail_over_mac only affects active-backup mode\n",
+		       bond->dev->name);
+		return -EINVAL;
+	}
+
 	if (bond_parm_tbl_lookup(fail_over_mac, fail_over_mac_tbl) < 0) {
 		pr_err("%s: Ignoring invalid fail_over_mac value %d.\n",
 		       bond->dev->name, fail_over_mac);

Signature · 1 line

1.8.0