diff options
| author |   Sedat Dilek <sedat.dilek@googlemail.com> | 2010-12-16 12:46:23 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-12-16 09:47:02 -0500 |
| commit | 7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6 (patch) | |
| tree | 292e3e0b7dd9aee05e021d14630ce1cbf0e11ce1 /drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |
| parent | rtlwifi: convert to __packed notation (diff) | |
| download | linux-dev-7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6.tar.xz linux-dev-7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6.zip | |
iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
| -rw-r--r-- | 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 5083dba122ca..75fcd30a7c13 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); } |