Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bonding:delete agg_select_mode from ad_bond_info

Browse source 
bond_params->ad_select and ad_bond_info->agg_select_mode have the same
meaning, they are duplicate and need extra synchronization.

__get_agg_selection_mode() get ad_select from bond_params directly.

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:
Peter Pan(潘卫平) 2011-06-08 21:19:03 +00:00 • committed by David S. Miller
parent 56d00c677d
commit 1a14fbcbc9
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/bonding/bond_3ad.c
View file

@ -262,7 +262,7 @@ static inline u32 __get_agg_selection_mode(struct port *port)
if (bond == NULL) if (bond == NULL)
return BOND_AD_STABLE; return BOND_AD_STABLE;
return BOND_AD_INFO(bond).agg_select_mode; return bond->params.ad_select;
} }
/** /**
@ -1859,7 +1859,6 @@ static void ad_marker_response_received(struct bond_marker *marker,
void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout) void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)
{ {
BOND_AD_INFO(bond).agg_select_timer = timeout; BOND_AD_INFO(bond).agg_select_timer = timeout;
BOND_AD_INFO(bond).agg_select_mode = bond->params.ad_select;
} }
static u16 aggregator_identifier; static u16 aggregator_identifier;

1
drivers/net/bonding/bond_3ad.h
View file

@ -253,7 +253,6 @@ struct ad_system {
struct ad_bond_info { struct ad_bond_info {
struct ad_system system; /* 802.3ad system structure */ 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_timer; // Timer to select aggregator after all adapter's hand shakes
u32 agg_select_mode; // Mode of selection of active aggregator(bandwidth/count)
struct timer_list ad_timer; struct timer_list ad_timer;
}; };