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: Weiping Pan <panweiping3@gmail.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b880a954b9
commit
ba824a8b2d
|
@ -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);
|
bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
|
||||||
read_unlock(&bond->lock);
|
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);
|
||||||
|
}
|
||||||
|
|
|
@ -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,
|
void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
|
||||||
struct slave *slave);
|
struct slave *slave);
|
||||||
int bond_3ad_set_carrier(struct bonding *bond);
|
int bond_3ad_set_carrier(struct bonding *bond);
|
||||||
|
void bond_3ad_update_lacp_rate(struct bonding *bond);
|
||||||
#endif //__BOND_3AD_H__
|
#endif //__BOND_3AD_H__
|
||||||
|
|
||||||
|
|
|
@ -804,6 +804,7 @@ static ssize_t bonding_store_lacp(struct device *d,
|
||||||
|
|
||||||
if ((new_value == 1) || (new_value == 0)) {
|
if ((new_value == 1) || (new_value == 0)) {
|
||||||
bond->params.lacp_fast = new_value;
|
bond->params.lacp_fast = new_value;
|
||||||
|
bond_3ad_update_lacp_rate(bond);
|
||||||
pr_info("%s: Setting LACP rate to %s (%d).\n",
|
pr_info("%s: Setting LACP rate to %s (%d).\n",
|
||||||
bond->dev->name, bond_lacp_tbl[new_value].modename,
|
bond->dev->name, bond_lacp_tbl[new_value].modename,
|
||||||
new_value);
|
new_value);
|
||||||
|
|
Loading…
Reference in a new issue