aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_3ad.c3
-rw-r--r--drivers/net/bonding/bond_3ad.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 013a8018daf1..6122725fc7c2 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -262,7 +262,7 @@ static inline u32 __get_agg_selection_mode(struct port *port)
262 if (bond == NULL) 262 if (bond == NULL)
263 return BOND_AD_STABLE; 263 return BOND_AD_STABLE;
264 264
265 return BOND_AD_INFO(bond).agg_select_mode; 265 return bond->params.ad_select;
266} 266}
267 267
268/** 268/**
@@ -1859,7 +1859,6 @@ static void ad_marker_response_received(struct bond_marker *marker,
1859void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout) 1859void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)
1860{ 1860{
1861 BOND_AD_INFO(bond).agg_select_timer = timeout; 1861 BOND_AD_INFO(bond).agg_select_timer = timeout;
1862 BOND_AD_INFO(bond).agg_select_mode = bond->params.ad_select;
1863} 1862}
1864 1863
1865static u16 aggregator_identifier; 1864static u16 aggregator_identifier;
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 97827857bf4d..1682e691bbe3 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -253,7 +253,6 @@ struct ad_system {
253struct ad_bond_info { 253struct ad_bond_info {
254 struct ad_system system; /* 802.3ad system structure */ 254 struct ad_system system; /* 802.3ad system structure */
255 u32 agg_select_timer; // Timer to select aggregator after all adapter's hand shakes 255 u32 agg_select_timer; // Timer to select aggregator after all adapter's hand shakes
256 u32 agg_select_mode; // Mode of selection of active aggregator(bandwidth/count)
257 struct timer_list ad_timer; 256 struct timer_list ad_timer;
258}; 257};
259 258