Ver código fonte

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>
Johannes Berg 16 anos atrás
pai
commit
ff550cb4f8
1 arquivos alterados com 1 adições e 7 exclusões
  1. 1 7
      drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+ 1 - 7
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 iwl_lq_sta *lq_data, u8 tid,
 				      struct sta_info *sta)
 				      struct sta_info *sta)
 {
 {
-	unsigned long state;
 	DECLARE_MAC_BUF(mac);
 	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",
 		IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n",
 				print_mac(mac, sta->sta.addr), tid);
 				print_mac(mac, sta->sta.addr), tid);
 		ieee80211_start_tx_ba_session(priv->hw, sta->sta.addr, tid);
 		ieee80211_start_tx_ba_session(priv->hw, sta->sta.addr, tid);