diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-10 21:17:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:24 -0400 |
commit | ff550cb4f8ef03f7cb0b4948e503388bcfb96034 (patch) | |
tree | c9c7d209c8130b2868c5e6a2722c86e501d451c0 /drivers | |
parent | 687c7c0807371aeaa94ff2fff511eeb326b5c5de (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 |
1 files changed, 1 insertions, 7 deletions
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, | |||
359 | struct iwl_lq_sta *lq_data, u8 tid, | 359 | struct iwl_lq_sta *lq_data, u8 tid, |
360 | struct sta_info *sta) | 360 | struct sta_info *sta) |
361 | { | 361 | { |
362 | unsigned long state; | ||
363 | DECLARE_MAC_BUF(mac); | 362 | DECLARE_MAC_BUF(mac); |
364 | 363 | ||
365 | spin_lock_bh(&sta->lock); | 364 | if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) { |
366 | state = sta->ampdu_mlme.tid_state_tx[tid]; | ||
367 | spin_unlock_bh(&sta->lock); | ||
368 | |||
369 | if (state == HT_AGG_STATE_IDLE && | ||
370 | rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) { | ||
371 | IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n", | 365 | IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n", |
372 | print_mac(mac, sta->sta.addr), tid); | 366 | print_mac(mac, sta->sta.addr), tid); |
373 | ieee80211_start_tx_ba_session(priv->hw, sta->sta.addr, tid); | 367 | ieee80211_start_tx_ba_session(priv->hw, sta->sta.addr, tid); |