[PATCH net-next 4/5] bonding: set fail_over_mac to active only in active-backup mode at enslavement
From: Ding Tianhong <hidden>
Date: 2014-01-21 09:44:43
Subsystem:
bonding driver, networking drivers, the rest · Maintainers:
Jay Vosburgh, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
The fail_over_mac only affect active-backup mode, if the first slave does not support setting the MAC address, we should set fail_over_mac to active only in active-backup mode, otherwise the bonding could not set all slaves to the master's address for other modes. Signed-off-by: Ding Tianhong <redacted> --- drivers/net/bonding/bond_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index ecff04e..a318a78 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c@@ -1336,7 +1336,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) if (!bond_has_slaves(bond)) { pr_warning("%s: Warning: The first slave device specified does not support setting the MAC address. Setting fail_over_mac to active.", bond_dev->name); - bond->params.fail_over_mac = BOND_FOM_ACTIVE; + if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) + bond->params.fail_over_mac = BOND_FOM_ACTIVE; } else if (bond->params.fail_over_mac != BOND_FOM_ACTIVE) { pr_err("%s: Error: The slave device specified does not support setting the MAC address, but fail_over_mac is not set to active.\n", bond_dev->name);
--
1.8.0