Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba824a8b authored by Peter Pan(潘卫平)'s avatar Peter Pan(潘卫平) Committed by David S. Miller
Browse files

bonding: make 802.3ad use latest lacp_rate 



There is bug that when you modify lacp_rate via sysfs,
802.3ad won't use the new value of lacp_rate to transmit packets.
This is because port->actor_oper_port_state isn't changed.

Signed-off-by: default avatarWeiping Pan <panweiping3@gmail.com>
Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b880a954

drivers/net/bonding/bond_3ad.c

+31 −0
Original line number Diff line number Diff line
@@ -2473,3 +2473,34 @@ void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond, 
	bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);

	read_unlock(&bond->lock);

}



/*

 * When modify lacp_rate parameter via sysfs,

 * update actor_oper_port_state of each port.

 *

 * Hold slave->state_machine_lock,

 * so we can modify port->actor_oper_port_state,

 * no matter bond is up or down.

 */

void bond_3ad_update_lacp_rate(struct bonding *bond)

{

	int i;

	struct slave *slave;

	struct port *port = NULL;

	int lacp_fast;



	read_lock(&bond->lock);

	lacp_fast = bond->params.lacp_fast;



	bond_for_each_slave(bond, slave, i) {

		port = &(SLAVE_AD_INFO(slave).port);

		__get_state_machine_lock(port);

		if (lacp_fast)

			port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT;

		else

			port->actor_oper_port_state &= ~AD_STATE_LACP_TIMEOUT;

		__release_state_machine_lock(port);

	}



	read_unlock(&bond->lock);

}

drivers/net/bonding/bond_3ad.h

+1 −0
Original line number Diff line number Diff line
@@ -282,5 +282,6 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev); 
void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,

			  struct slave *slave);

int bond_3ad_set_carrier(struct bonding *bond);

void bond_3ad_update_lacp_rate(struct bonding *bond);

#endif //__BOND_3AD_H__

drivers/net/bonding/bond_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ static ssize_t bonding_store_lacp(struct device *d, 


	if ((new_value == 1) || (new_value == 0)) {

		bond->params.lacp_fast = new_value;

		bond_3ad_update_lacp_rate(bond);

		pr_info("%s: Setting LACP rate to %s (%d).\n",

			bond->dev->name, bond_lacp_tbl[new_value].modename,

			new_value);