diff options
author | Jonathan Toppins <jtoppins@cumulusnetworks.com> | 2015-01-26 01:16:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-27 20:09:03 -0500 |
commit | 2477bc9a3db53540c64687c79efae9a7f1f60cef (patch) | |
tree | 47209b6dd229ac7f6ec122463042d1bb91d235ee /drivers/net/bonding | |
parent | 999028cc1ccd1cd3a1c0104c6423553d3f573197 (diff) |
bonding: update bond carrier state when min_links option changes
Cc: Andy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: Jonathan Toppins <jtoppins@cumulusnetworks.com>
Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 2 | ||||
-rw-r--r-- | drivers/net/bonding/bond_options.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index f47bc433407a..f83ace6bab2f 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -334,7 +334,7 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, | |||
334 | * | 334 | * |
335 | * Returns zero if carrier state does not change, nonzero if it does. | 335 | * Returns zero if carrier state does not change, nonzero if it does. |
336 | */ | 336 | */ |
337 | static int bond_set_carrier(struct bonding *bond) | 337 | int bond_set_carrier(struct bonding *bond) |
338 | { | 338 | { |
339 | struct list_head *iter; | 339 | struct list_head *iter; |
340 | struct slave *slave; | 340 | struct slave *slave; |
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 9bd538d4474b..4df28943d222 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c | |||
@@ -1181,6 +1181,7 @@ static int bond_option_min_links_set(struct bonding *bond, | |||
1181 | netdev_info(bond->dev, "Setting min links value to %llu\n", | 1181 | netdev_info(bond->dev, "Setting min links value to %llu\n", |
1182 | newval->value); | 1182 | newval->value); |
1183 | bond->params.min_links = newval->value; | 1183 | bond->params.min_links = newval->value; |
1184 | bond_set_carrier(bond); | ||
1184 | 1185 | ||
1185 | return 0; | 1186 | return 0; |
1186 | } | 1187 | } |