From cb8f43a327bdbe478b75e1b804bbdba235759746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Pan=28=E6=BD=98=E5=8D=AB=E5=B9=B3=29?= Date: Wed, 8 Jun 2011 21:19:03 +0000 Subject: [PATCH] --- yaml --- r: 255490 b: refs/heads/master c: 1a14fbcbc96bd098540eb54b66976c20a73b8473 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 3 +-- trunk/drivers/net/bonding/bond_3ad.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eebf1a6b7cf6..4e760bd8d8d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56d00c677de0a6285587af4f6c6f10aef3209f9f +refs/heads/master: 1a14fbcbc96bd098540eb54b66976c20a73b8473 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index 013a8018daf1..6122725fc7c2 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -262,7 +262,7 @@ static inline u32 __get_agg_selection_mode(struct port *port) if (bond == NULL) 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) { BOND_AD_INFO(bond).agg_select_timer = timeout; - BOND_AD_INFO(bond).agg_select_mode = bond->params.ad_select; } static u16 aggregator_identifier; diff --git a/trunk/drivers/net/bonding/bond_3ad.h b/trunk/drivers/net/bonding/bond_3ad.h index 97827857bf4d..1682e691bbe3 100644 --- a/trunk/drivers/net/bonding/bond_3ad.h +++ b/trunk/drivers/net/bonding/bond_3ad.h @@ -253,7 +253,6 @@ struct ad_system { 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) struct timer_list ad_timer; };