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 <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index f45a752e93c67e5ff93bcf475cd590cb93e14327..8b57b390c8bace21e6407e1ec51e00d1d590e0c2 100644 (file)
--- 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);