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

Commit e4e72fb4 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi 



This patch removes all the virtual A-MPDU-queue bookkeeping from
mac80211. Curiously, iwlwifi already does its own bookkeeping, so
it doesn't require much changes except where it needs to handle
starting and stopping the queues in mac80211.

To handle the queue stop/wake properly, we rewrite the software
queue number for aggregation frames and internally to iwlwifi keep
track of the queues that map into the same AC queue, and only talk
to mac80211 about the AC queue. The implementation requires calling
two new functions, iwl_stop_queue and iwl_wake_queue instead of the
mac80211 counterparts.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: Reinette Chattre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cd8ffc80

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

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv, 
	if (iwl_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);

		iwl_wake_queue(priv, txq_id);

}



/**

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

+3 −4
Original line number Diff line number Diff line
@@ -2178,10 +2178,9 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 
			    (iwl_queue_space(&txq->q) > txq->q.low_mark) &&

			    (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) {

				if (agg->state == IWL_AGG_OFF)

					ieee80211_wake_queue(priv->hw, txq_id);

					iwl_wake_queue(priv, txq_id);

				else

					ieee80211_wake_queue(priv->hw,

							     txq->swq_id);

					iwl_wake_queue(priv, txq->swq_id);

			}

		}

	} else {
@@ -2205,7 +2204,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 


		if (priv->mac80211_registered &&

		    (iwl_queue_space(&txq->q) > txq->q.low_mark))

			ieee80211_wake_queue(priv->hw, txq_id);

			iwl_wake_queue(priv, txq_id);

	}



	if (qc && likely(sta_id != IWL_INVALID_STATION))

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

+3 −4
Original line number Diff line number Diff line
@@ -1295,10 +1295,9 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 
			    (iwl_queue_space(&txq->q) > txq->q.low_mark) &&

			    (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) {

				if (agg->state == IWL_AGG_OFF)

					ieee80211_wake_queue(priv->hw, txq_id);

					iwl_wake_queue(priv, txq_id);

				else

					ieee80211_wake_queue(priv->hw,

							     txq->swq_id);

					iwl_wake_queue(priv, txq->swq_id);

			}

		}

	} else {
@@ -1324,7 +1323,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, 


		if (priv->mac80211_registered &&

		    (iwl_queue_space(&txq->q) > txq->q.low_mark))

			ieee80211_wake_queue(priv->hw, txq_id);

			iwl_wake_queue(priv, txq_id);

	}



	if (ieee80211_is_data_qos(tx_resp->frame_ctrl))

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

+0 −3
Original line number Diff line number Diff line
@@ -1309,9 +1309,6 @@ int iwl_setup_mac(struct iwl_priv *priv) 


	/* Default value; 4 EDCA QOS priorities */

	hw->queues = 4;

	/* queues to support 11n aggregation */

	if (priv->cfg->sku & IWL_SKU_N)

		hw->ampdu_queues = priv->cfg->mod_params->num_of_ampdu_queues;



	hw->conf.beacon_int = 100;

	hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;

drivers/net/wireless/iwlwifi/iwl-dev.h

+6 −0
Original line number Diff line number Diff line
@@ -996,6 +996,12 @@ struct iwl_priv { 
	u8 key_mapping_key;

	unsigned long ucode_key_table;



	/* queue refcounts */

#define IWL_MAX_HW_QUEUES	32

	unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];

	/* for each AC */

	atomic_t queue_stop_count[4];



	/* Indication if ieee80211_ops->open has been called */

	u8 is_open;