diff --git a/[refs] b/[refs] index d5b498205212..5fe2aa21a523 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e137478b56fd79c397b5c5c74fc08c049a42835a +refs/heads/master: 7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index 5083dba122ca..75fcd30a7c13 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/trunk/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); }