aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
authorPeter Pan(潘卫平) <panweiping3@gmail.com>2011-06-08 17:19:02 -0400
committerDavid S. Miller <davem@davemloft.net>2011-06-09 18:02:19 -0400
commit56d00c677de0a6285587af4f6c6f10aef3209f9f (patch)
treeeee1af15c0b836495d59e42053bac065827a1618 /drivers/net/bonding/bond_main.c
parentba824a8b2d77942d51ce45ed721f65764c00ab50 (diff)
bonding:delete lacp_fast from ad_bond_info
These is also a bug, that if you modify lacp_rate via sysfs, and add new slaves in bonding, new slaves won't use the latest lacp_rate, since ad_bond_info->lacp_fast is initialized only once, in bond_3ad_initialize(). Since both struct bond_params and ad_bond_info have lacp_fast, they are duplicate and need extra synchronization. bond_3ad_bind_slave() can use bond_params->lacp_fast to initialize port. So we can just remove lacp_fast from struct ad_bond_info. 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>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 716c852a6968..bb1af9c1629f 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1843,8 +1843,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
1843 /* Initialize AD with the number of times that the AD timer is called in 1 second 1843 /* Initialize AD with the number of times that the AD timer is called in 1 second
1844 * can be called only after the mac address of the bond is set 1844 * can be called only after the mac address of the bond is set
1845 */ 1845 */
1846 bond_3ad_initialize(bond, 1000/AD_TIMER_INTERVAL, 1846 bond_3ad_initialize(bond, 1000/AD_TIMER_INTERVAL);
1847 bond->params.lacp_fast);
1848 } else { 1847 } else {
1849 SLAVE_AD_INFO(new_slave).id = 1848 SLAVE_AD_INFO(new_slave).id =
1850 SLAVE_AD_INFO(new_slave->prev).id + 1; 1849 SLAVE_AD_INFO(new_slave->prev).id + 1;