aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 8e6dd13b3607..35f7e90aef72 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3439,7 +3439,8 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
3439 /* If fail_over_mac is enabled, do nothing and return success. 3439 /* If fail_over_mac is enabled, do nothing and return success.
3440 * Returning an error causes ifenslave to fail. 3440 * Returning an error causes ifenslave to fail.
3441 */ 3441 */
3442 if (bond->params.fail_over_mac) 3442 if (bond->params.fail_over_mac &&
3443 bond->params.mode == BOND_MODE_ACTIVEBACKUP)
3443 return 0; 3444 return 0;
3444 3445
3445 if (!is_valid_ether_addr(sa->sa_data)) 3446 if (!is_valid_ether_addr(sa->sa_data))