Return-path: Received: from mga02.intel.com ([134.134.136.20]:39658 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783Ab0CXVma (ORCPT ); Wed, 24 Mar 2010 17:42:30 -0400 Subject: Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n From: reinette chatre To: Johannes Berg Cc: "John W. Linville" , "linux-wireless@vger.kernel.org" , "linux-next@vger.kernel.org" In-Reply-To: <1269466426.6935.8.camel@jlt3.sipsolutions.net> References: <4BAA73D2.1000301@oracle.com> <1269465799-19060-1-git-send-email-linville@tuxdriver.com> <1269466426.6935.8.camel@jlt3.sipsolutions.net> Content-Type: text/plain; charset="UTF-8" Date: Wed, 24 Mar 2010 14:42:28 -0700 Message-ID: <1269466948.2446.3216.camel@rchatre-DESK> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Wed, 2010-03-24 at 14:33 -0700, Johannes Berg wrote: > On Wed, 2010-03-24 at 17:23 -0400, John W. Linville wrote: > > drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health': > > drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn' > > > > Reported-by: Randy Dunlap > > Signed-off-by: John W. Linville > > --- > > drivers/net/wireless/iwlwifi/iwl-rx.c | 2 ++ > > 1 files changed, 2 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c > > index b6a64d8..2fa30df 100644 > > --- a/drivers/net/wireless/iwlwifi/iwl-rx.c > > +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c > > @@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv, > > #define BA_TIMEOUT_CNT (5) > > #define BA_TIMEOUT_MAX (16) > > > > +#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE) > > /** > > * iwl_good_ack_health - checks for ACK count ratios, BA timeout > > retries. > > I thought we had a patch moving it? > We do, but it has not been pushed upstream yet. John, I'd prefer http://viggo.jf.intel.com/~wifi/repos.git/?p=iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1 Should we push it upstream asap or can it wait until our next series goes out after all our validation cycles pass? Reinette