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

Commit b2d81db7 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: clean up FIFO definitions 



Move all FIFO definitions together into the firmware API
header file and use the same enum/naming scheme for the
command FIFO.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 3dfd3a97

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+8 −1
Original line number Diff line number Diff line
@@ -84,7 +84,14 @@ enum { 
	IWL_MVM_CMD_QUEUE = 9,

};



#define IWL_MVM_CMD_FIFO	7

enum iwl_mvm_tx_fifo {

	IWL_MVM_TX_FIFO_BK = 0,

	IWL_MVM_TX_FIFO_BE,

	IWL_MVM_TX_FIFO_VI,

	IWL_MVM_TX_FIFO_VO,

	IWL_MVM_TX_FIFO_MCAST = 5,

	IWL_MVM_TX_FIFO_CMD = 7,

};



#define IWL_MVM_STATION_COUNT	16

drivers/net/wireless/iwlwifi/mvm/mvm.h

+0 −8
Original line number Diff line number Diff line
@@ -105,14 +105,6 @@ 
 */

#define IWL_MVM_CS_UNBLOCK_TX_TIMEOUT 3



enum iwl_mvm_tx_fifo {

	IWL_MVM_TX_FIFO_BK = 0,

	IWL_MVM_TX_FIFO_BE,

	IWL_MVM_TX_FIFO_VI,

	IWL_MVM_TX_FIFO_VO,

	IWL_MVM_TX_FIFO_MCAST = 5,

};



extern const struct ieee80211_ops iwl_mvm_hw_ops;



/**

drivers/net/wireless/iwlwifi/mvm/ops.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	trans_cfg.command_names = iwl_mvm_cmd_strings;



	trans_cfg.cmd_queue = IWL_MVM_CMD_QUEUE;

	trans_cfg.cmd_fifo = IWL_MVM_CMD_FIFO;

	trans_cfg.cmd_fifo = IWL_MVM_TX_FIFO_CMD;



	snprintf(mvm->hw->wiphy->fw_version,

		 sizeof(mvm->hw->wiphy->fw_version),