Commit 2477bc9a authored by Jonathan Toppins's avatar Jonathan Toppins Committed by David S. Miller
Browse files

bonding: update bond carrier state when min_links option changes 



Cc: Andy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: default avatarJonathan Toppins <jtoppins@cumulusnetworks.com>
Signed-off-by: default avatarJay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 999028cc

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev, 
 *

 * Returns zero if carrier state does not change, nonzero if it does.

 */

static int bond_set_carrier(struct bonding *bond)

int bond_set_carrier(struct bonding *bond)

{

	struct list_head *iter;

	struct slave *slave;

drivers/net/bonding/bond_options.c

+1 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,7 @@ static int bond_option_min_links_set(struct bonding *bond, 
	netdev_info(bond->dev, "Setting min links value to %llu\n",

		    newval->value);

	bond->params.min_links = newval->value;

	bond_set_carrier(bond);



	return 0;

}

include/net/bonding.h

+1 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ void bond_sysfs_slave_del(struct slave *slave); 
int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev);

int bond_release(struct net_device *bond_dev, struct net_device *slave_dev);

u32 bond_xmit_hash(struct bonding *bond, struct sk_buff *skb);

int bond_set_carrier(struct bonding *bond);

void bond_select_active_slave(struct bonding *bond);

void bond_change_active_slave(struct bonding *bond, struct slave *new_active);

void bond_create_debugfs(void);