Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d0b2c1c authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: map A-MPDU HW queue to mac80211 A-MPDU SW queue 



This patch maps A-MPDU HW queue to mac80211 SW queue scheme (as introduced
in patch "mac80211: QoS related cleanups"), when trying to perform
ieee80211_wake_queue.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 07346f81

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

+4 −1
Original line number Diff line number Diff line
@@ -3547,13 +3547,16 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv, 
	 * block-ack window (we assume that they've been successfully

	 * transmitted ... if not, it's too late anyway). */

	if (txq->q.read_ptr != (ba_resp_scd_ssn & 0xff)) {

		/* calculate mac80211 ampdu sw queue to wake */

		int ampdu_q =

		   scd_flow - IWL_BACK_QUEUE_FIRST_ID + priv->hw->queues;

		int freed = iwl4965_tx_queue_reclaim(priv, scd_flow, index);

		priv->stations[ba_resp->sta_id].

			tid[ba_resp->tid].tfds_in_queue -= freed;

		if (iwl4965_queue_space(&txq->q) > txq->q.low_mark &&

			priv->mac80211_registered &&

			agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)

			ieee80211_wake_queue(priv->hw, scd_flow);

			ieee80211_wake_queue(priv->hw, ampdu_q);

		iwl4965_check_empty_hw_queue(priv, ba_resp->sta_id,

			ba_resp->tid, scd_flow);

	}

drivers/net/wireless/iwlwifi/iwl4965-base.c

+11 −12
Original line number Diff line number Diff line
@@ -2568,12 +2568,6 @@ int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) 
		nfreed++;

	}



/*	if (iwl4965_queue_space(q) > q->low_mark && (txq_id >= 0) &&

			(txq_id != IWL_CMD_QUEUE_NUM) &&

			priv->mac80211_registered)

		ieee80211_wake_queue(priv->hw, txq_id); */





	return nfreed;

}
@@ -2797,7 +2791,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
		}



		if (txq->q.read_ptr != (scd_ssn & 0xff)) {

			int freed;

			int freed, ampdu_q;

			index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);

			IWL_DEBUG_TX_REPLY("Retry scheduler reclaim scd_ssn "

					   "%d index %d\n", scd_ssn , index);
@@ -2806,9 +2800,15 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 


			if (iwl4965_queue_space(&txq->q) > txq->q.low_mark &&

			    txq_id >= 0 && priv->mac80211_registered &&

			    agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)

			    agg->state != IWL_EMPTYING_HW_QUEUE_DELBA) {

				/* calculate mac80211 ampdu sw queue to wake */

				ampdu_q = txq_id - IWL_BACK_QUEUE_FIRST_ID +

					  priv->hw->queues;

				if (agg->state == IWL_AGG_OFF)

					ieee80211_wake_queue(priv->hw, txq_id);



				else

					ieee80211_wake_queue(priv->hw, ampdu_q);

			}

			iwl4965_check_empty_hw_queue(priv, sta_id, tid, txq_id);

		}

	} else {
@@ -2833,8 +2833,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
		if (tid != MAX_TID_COUNT)

			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

		if (iwl4965_queue_space(&txq->q) > txq->q.low_mark &&

			(txq_id >= 0) &&

			priv->mac80211_registered)

			(txq_id >= 0) && priv->mac80211_registered)

			ieee80211_wake_queue(priv->hw, txq_id);

		if (tid != MAX_TID_COUNT)

			iwl4965_check_empty_hw_queue(priv, sta_id, tid, txq_id);