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

Commit cefeaa5f authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: cmd_queue moves to iwl_shared 



Since it is used by all the layers, it needs to move to iwl_shared.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d6189124

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

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv) 


	/* waiting for all the tx frames complete might take a while */

	for (cnt = 0; cnt < hw_params(priv).max_txq_num; cnt++) {

		if (cnt == priv->cmd_queue)

		if (cnt == priv->shrd->cmd_queue)

			continue;

		txq = &priv->txq[cnt];

		q = &txq->q;

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

+2 −2
Original line number Diff line number Diff line
@@ -1244,10 +1244,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 


	if (ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PAN) {

		priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN;

		priv->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;

		priv->shrd->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;

	} else {

		priv->sta_key_max_num = STA_KEY_MAX_NUM;

		priv->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;

		priv->shrd->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;

	}



	/*

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

+2 −2
Original line number Diff line number Diff line
@@ -1818,14 +1818,14 @@ void iwl_bg_watchdog(unsigned long data) 
		return;



	/* monitor and check for stuck cmd queue */

	if (iwl_check_stuck_queue(priv, priv->cmd_queue))

	if (iwl_check_stuck_queue(priv, priv->shrd->cmd_queue))

		return;



	/* monitor and check for other stuck queues */

	if (iwl_is_any_associated(priv)) {

		for (cnt = 0; cnt < hw_params(priv).max_txq_num; cnt++) {

			/* skip as we already checked the command queue */

			if (cnt == priv->cmd_queue)

			if (cnt == priv->shrd->cmd_queue)

				continue;

			if (iwl_check_stuck_queue(priv, cnt))

				return;

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

+0 −3
Original line number Diff line number Diff line
@@ -1237,9 +1237,6 @@ struct iwl_priv { 
	/* microcode/device supports multiple contexts */

	u8 valid_contexts;



	/* command queue number */

	u8 cmd_queue;



	/* max number of station keys */

	u8 sta_key_max_num;

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

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ 


#define SCD_QUEUECHAIN_SEL_ALL(priv)	\

	(((1<<hw_params(priv).max_txq_num) - 1) &\

	(~(1<<(priv)->cmd_queue)))

	(~(1<<(priv)->shrd->cmd_queue)))



#define SCD_BASE			(PRPH_BASE + 0xa02c00)