[PATCH] iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate

[PATCH] iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate

[Sedat Dilek]

[-- Attachment #1: Type: text/plain, Size: 132 bytes --]

Attached patch fixes an issue with linux-next (20101216) and iwlwifi (see [1]).

- Sedat -

[1] http://lkml.org/lkml/2010/12/16/101

[-- Attachment #2: 0001-iwlwifi-Fix-error-struct-iwl_lq_sta-has-no-member-na.patch --]
[-- Type: text/plain, Size: 1827 bytes --]

From 7edfcb92159f36cb6aaa7eb1a9453f75d7461028 Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@gmail.com>
Date: Thu, 16 Dec 2010 12:26:04 +0100
Subject: [PATCH] iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While compiling linux-next (next-20101216) I fell over this breakage:
...
drivers/net/wireless/iwlwifi/iwl-agn-rs.c: In function ‘iwl_rs_rate_init’:
drivers/net/wireless/iwlwifi/iwl-agn-rs.c:2876:8: error: ‘struct iwl_lq_sta’ has no member named ‘dbg_fixed_rate’

dbg_fixed_rate is only used 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

The issue was introduced by commit a1da077bc36368eb7d6312e7e49260f0a3d92c77:
"iwlwifi: clear dbg_fixed_rate during init"

Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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);
 }
-- 
1.7.2.3

Re: [PATCH] iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate

[Guy, Wey-Yi]

Hi Sedat,

On Thu, 2010-12-16 at 03:46 -0800, Sedat Dilek wrote:
> Attached patch fixes an issue with linux-next (20101216) and iwlwifi (see [1]).
> 
> - Sedat -
> 
> [1] http://lkml.org/lkml/2010/12/16/101

ACKed-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

Thank you very much for catch this mistake and fix it so quickly.

Wey

Re: [PATCH] iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate

[Sedat Dilek]

On Thu, Dec 16, 2010 at 5:13 PM, Guy, Wey-Yi <wey-yi.w.guy@intel.com> wrote:
> Hi Sedat,
>
> On Thu, 2010-12-16 at 03:46 -0800, Sedat Dilek wrote:
>> Attached patch fixes an issue with linux-next (20101216) and iwlwifi (see [1]).
>>
>> - Sedat -
>>
>> [1] http://lkml.org/lkml/2010/12/16/101
>
> ACKed-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
>
> Thank you very much for catch this mistake and fix it so quickly.
>
> Wey
>
>

N.p., the patch is now in wireless-next-2.6 GIT master (so we will
have it in next-20101217).
Thanks John.

- Sedat -