diff options
| author | Peter Pan(潘卫平) <panweiping3@gmail.com> | 2011-06-08 21:19:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-09 15:02:19 -0700 |
| commit | 56d00c677de0a6285587af4f6c6f10aef3209f9f (patch) | |
| tree | eee1af15c0b836495d59e42053bac065827a1618 /drivers/net/bonding/bond_3ad.h | |
| parent | ba824a8b2d77942d51ce45ed721f65764c00ab50 (diff) | |
| download | lwn-56d00c677de0a6285587af4f6c6f10aef3209f9f.tar.gz lwn-56d00c677de0a6285587af4f6c6f10aef3209f9f.zip | |
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_3ad.h')
| -rw-r--r-- | drivers/net/bonding/bond_3ad.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index e466faf3d6fd..97827857bf4d 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -254,9 +254,6 @@ struct ad_bond_info { struct ad_system system; /* 802.3ad system structure */ u32 agg_select_timer; // Timer to select aggregator after all adapter's hand shakes u32 agg_select_mode; // Mode of selection of active aggregator(bandwidth/count) - int lacp_fast; /* whether fast periodic tx should be - * requested - */ struct timer_list ad_timer; }; @@ -269,7 +266,7 @@ struct ad_slave_info { }; // ================= AD Exported functions to the main bonding code ================== -void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution, int lacp_fast); +void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution); int bond_3ad_bind_slave(struct slave *slave); void bond_3ad_unbind_slave(struct slave *slave); void bond_3ad_state_machine_handler(struct work_struct *); |