aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-11-10 21:25:43 -0500
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-11-16 10:45:35 -0500
commit4bea9b990205e4a3d432d9d6c29687215618a306 (patch)
tree4aed13159e194298cc1bf5ebd10879928dab2e2b /drivers/net/wireless/iwlwifi/iwl-4965.c
parent8d56396ac3926412dd97dcb9dd8d0cef556b908e (diff)
iwlagn: remove a bogus AGG_OFF check
Even if this check were to happen, using the txq_id here (which is a HW queue) would lead to confusion in mac80211. Luckily, it doesn't seem like this can ever happen. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 19da3e5e9eeb..19400792a3fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2238,12 +2238,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
2238 2238
2239 if (priv->mac80211_registered && 2239 if (priv->mac80211_registered &&
2240 (iwl_queue_space(&txq->q) > txq->q.low_mark) && 2240 (iwl_queue_space(&txq->q) > txq->q.low_mark) &&
2241 (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) { 2241 (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
2242 if (agg->state == IWL_AGG_OFF) 2242 iwl_wake_queue(priv, txq->swq_id);
2243 iwl_wake_queue(priv, txq_id);
2244 else
2245 iwl_wake_queue(priv, txq->swq_id);
2246 }
2247 } 2243 }
2248 } else { 2244 } else {
2249 info->status.rates[0].count = tx_resp->failure_frame + 1; 2245 info->status.rates[0].count = tx_resp->failure_frame + 1;