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

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

iwlagn: init cmd_queue earlier 



We know after loading the ucode whether it will
support PAN or not, so we can also initialise
the cmd_queue variable much earlier.

Signed-off-by: default avatarJohannes Berg <johannes.berg@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 d7d5783c

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

+5 −6
Original line number Diff line number Diff line
@@ -1700,6 +1700,11 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
	} else

		priv->sta_key_max_num = STA_KEY_MAX_NUM;



	if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS))

		priv->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;

	else

		priv->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;



	if (ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BTSTATS ||

	    (priv->cfg->bt_params && priv->cfg->bt_params->bt_statistics))

		priv->bt_statistics = true;
@@ -2518,12 +2523,6 @@ static int __iwl_up(struct iwl_priv *priv) 


	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);



	/* must be initialised before iwl_hw_nic_init */

	if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS))

		priv->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;

	else

		priv->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;



	ret = iwlagn_hw_nic_init(priv);

	if (ret) {

		IWL_ERR(priv, "Unable to init nic\n");