Commit 4bea9b99 authored Nov 10, 2010 by Johannes Berg Committed by Wey-Yi Guy Nov 16, 2010

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>

parent 8d56396a

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -2238,13 +2238,9 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,

		if (priv->mac80211_registered &&
		(iwl_queue_space(&txq->q) > txq->q.low_mark) &&
		(agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) {
		if (agg->state == IWL_AGG_OFF)
		iwl_wake_queue(priv, txq_id);
		else
		(agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
		iwl_wake_queue(priv, txq->swq_id);
		}
		}
		} else {
		info->status.rates[0].count = tx_resp->failure_frame + 1;
		info->flags \|= iwl_tx_status_to_mac80211(status);

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -445,13 +445,9 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv,

		if (priv->mac80211_registered &&
		(iwl_queue_space(&txq->q) > txq->q.low_mark) &&
		(agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) {
		if (agg->state == IWL_AGG_OFF)
		iwl_wake_queue(priv, txq_id);
		else
		(agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
		iwl_wake_queue(priv, txq->swq_id);
		}
		}
		} else {
		BUG_ON(txq_id != txq->swq_id);
		iwlagn_set_tx_status(priv, info, tx_resp, txq_id, false);