From: Johannes Berg Date: Thu, 11 Sep 2008 01:17:05 +0000 (+0200) Subject: iwlwifi: don't access mac80211's AMPDU state machine X-Git-Tag: MMI-PSA29.97-13-9~31818^2~268^2~16 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff550cb4f8ef03f7cb0b4948e503388bcfb96034;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git iwlwifi: don't access mac80211's AMPDU state machine There really is no need, at worst ieee80211_start_tx_ba_session will log a message when debugging is enabled, and poking such internals of mac80211 definitely doesn't belong into an RC algorithm. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index f45a752e93c6..8b57b390c8ba 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c @@ -359,15 +359,9 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, struct iwl_lq_sta *lq_data, u8 tid, struct sta_info *sta) { - unsigned long state; DECLARE_MAC_BUF(mac); - spin_lock_bh(&sta->lock); - state = sta->ampdu_mlme.tid_state_tx[tid]; - spin_unlock_bh(&sta->lock); - - if (state == HT_AGG_STATE_IDLE && - rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) { + if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) { IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n", print_mac(mac, sta->sta.addr), tid); ieee80211_start_tx_ba_session(priv->hw, sta->sta.addr, tid);