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

Commit 9416560e authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Luca Coelho
Browse files

iwlwifi: pcie: store the default rxq number 



Store the default rxq number in a variable, so we won't need
to use the actual number in the code.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 0791c2fc

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ struct iwl_self_init_dram { 
 * @ucode_write_complete: indicates that the ucode has been copied.

 * @ucode_write_waitq: wait queue for uCode load

 * @cmd_queue - command queue number

 * @def_rx_queue - default rx queue number

 * @rx_buf_size: Rx buffer size

 * @bc_table_dword: true if the BC table expects DWORD (as opposed to bytes)

 * @scd_set_active: should the transport configure the SCD for HCMD queue
@@ -536,6 +537,7 @@ struct iwl_trans_pcie { 
	u8 page_offs, dev_cmd_offs;



	u8 cmd_queue;

	u8 def_rx_queue;

	u8 cmd_fifo;

	unsigned int cmd_q_wdg_timeout;

	u8 n_no_reclaim_cmds;

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1271,7 +1271,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans, 
		index = SEQ_TO_INDEX(sequence);

		cmd_index = iwl_pcie_get_cmd_index(txq, index);



		if (rxq->id == 0)

		if (rxq->id == trans_pcie->def_rx_queue)

			iwl_op_mode_rx(trans->op_mode, &rxq->napi,

				       &rxcb);

		else

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −0
Original line number Diff line number Diff line
@@ -3276,6 +3276,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
				       PCIE_LINK_STATE_CLKPM);

	}



	trans_pcie->def_rx_queue = 0;



	if (cfg->use_tfh) {

		addr_size = 64;

		trans_pcie->max_tbs = IWL_TFH_NUM_TBS;