Commit f7c7eb7f authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bonding: implement lower state change propagation 



Let netdev notifier listeners know about link and slave state change.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d397061

drivers/net/bonding/bond_main.c

+10 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,16 @@ void bond_queue_slave_event(struct slave *slave) 
	queue_delayed_work(slave->bond->wq, &nnw->work, 0);

}



void bond_lower_state_changed(struct slave *slave)

{

	struct netdev_lag_lower_state_info info;



	info.link_up = slave->link == BOND_LINK_UP ||

		       slave->link == BOND_LINK_FAIL;

	info.tx_enabled = bond_is_active_slave(slave);

	netdev_lower_state_changed(slave->dev, &info);

}



/* enslave device <slave> to bond device <master> */

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)

{

include/net/bonding.h

+7 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ struct bonding { 
	((struct slave *) rtnl_dereference(dev->rx_handler_data))



void bond_queue_slave_event(struct slave *slave);

void bond_lower_state_changed(struct slave *slave);



struct bond_vlan_tag {

	__be16		vlan_proto;
@@ -328,6 +329,7 @@ static inline void bond_set_active_slave(struct slave *slave) 
	if (slave->backup) {

		slave->backup = 0;

		bond_queue_slave_event(slave);

		bond_lower_state_changed(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

	}

}
@@ -337,6 +339,7 @@ static inline void bond_set_backup_slave(struct slave *slave) 
	if (!slave->backup) {

		slave->backup = 1;

		bond_queue_slave_event(slave);

		bond_lower_state_changed(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

	}

}
@@ -349,6 +352,7 @@ static inline void bond_set_slave_state(struct slave *slave, 


	slave->backup = slave_state;

	if (notify) {

		bond_lower_state_changed(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

		bond_queue_slave_event(slave);

		slave->should_notify = 0;
@@ -380,6 +384,7 @@ static inline void bond_slave_state_notify(struct bonding *bond) 


	bond_for_each_slave(bond, tmp, iter) {

		if (tmp->should_notify) {

			bond_lower_state_changed(tmp);

			rtmsg_ifinfo(RTM_NEWLINK, tmp->dev, 0, GFP_ATOMIC);

			tmp->should_notify = 0;

		}
@@ -514,6 +519,7 @@ static inline void bond_set_slave_link_state(struct slave *slave, int state, 
	slave->link = state;

	if (notify) {

		bond_queue_slave_event(slave);

		bond_lower_state_changed(slave);

		slave->should_notify_link = 0;

	} else {

		if (slave->should_notify_link)
@@ -531,6 +537,7 @@ static inline void bond_slave_link_notify(struct bonding *bond) 
	bond_for_each_slave(bond, tmp, iter) {

		if (tmp->should_notify_link) {

			bond_queue_slave_event(tmp);

			bond_lower_state_changed(tmp);

			tmp->should_notify_link = 0;

		}

	}