Return-path: Received: from mail-qw0-f46.google.com ([209.85.216.46]:62782 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754237Ab0LPLQW convert rfc822-to-8bit (ORCPT ); Thu, 16 Dec 2010 06:16:22 -0500 MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: References: Date: Thu, 16 Dec 2010 12:16:21 +0100 Message-ID: Subject: Re: linux-next: Tree for December 16 (broken iwlwifi) From: Sedat Dilek To: Stephen Rothwell , John Linville Cc: LKML , wireless , Johannes Berg , Wey-Yi Guy , Randy Dunlap Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, Dec 16, 2010 at 12:05 PM, Sedat Dilek wrote: > On Thu, Dec 16, 2010 at 11:54 AM, Sedat Dilek > wrote: >> Hi, >> >> Just FYI (didn't look at the code right now, sorry for German output): >> >> [ build.log ] >> ... >> /home/sd/src/linux-2.6/linux-2.6.37-rc5/debian/build/source_i386_none/drivers/net/wireless/iwlwifi/iwl-agn-rs.c: >> In function ‘iwl_rs_rate_init’: >> /home/sd/src/linux-2.6/linux-2.6.37-rc5/debian/build/source_i386_none/drivers/net/wireless/iwlwifi/iwl-agn-rs.c:2876:8: >> error: ‘struct iwl_lq_sta’ has no member named ‘dbg_fixed_rate’ >> make[8]: *** [drivers/net/wireless/iwlwifi/iwl-agn-rs.o] Fehler 1 >> make[7]: *** [drivers/net/wireless/iwlwifi] Fehler 2 >> make[6]: *** [drivers/net/wireless] Fehler 2 >> make[6]: *** Warte auf noch nicht beendete Prozesse... >> ... >> >> Regards, >> - Sedat - >> > > Looks like dbg_fixed_rate is only set when CONFIG_MAC80211_DEBUGFS is set: > > [ drivers/net/wireless/iwlwifi/iwl-agn-rs.h ] > ... > #ifdef CONFIG_MAC80211_DEBUGFS >        struct dentry *rs_sta_dbgfs_scale_table_file; >        struct dentry *rs_sta_dbgfs_stats_table_file; >        struct dentry *rs_sta_dbgfs_rate_scale_data_file; >        struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file; >        u32 dbg_fixed_rate; > #endif > ... > > So I have no CONFIG_MAC80211_DEBUGFS... :-). > Can someone fix that, please? > > - Sedat - > Untested ! ----- SNIP ----- diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index 5083dba..75fcd30 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c @@ -2873,7 +2873,9 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE; lq_sta->is_agg = 0; +#ifdef CONFIG_MAC80211_DEBUGFS lq_sta->dbg_fixed_rate = 0; +#endif rs_initialize_lq(priv, conf, sta, lq_sta); } ----- SNAP -----