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

Commit e4875470 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2017-11-28' of... 

Merge tag 'iwlwifi-for-kalle-2017-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

Second batch of fixes intended for 4.15.

* One fix in rate-scaling;
* One fix for the TX queue hang detection for AP/GO modes;
* Fix the TX queue hang timeout used in monitor interfaces;
* Fix packet injection;
* Remove a wrong error message when dumping PCI registers;
* Fix race condition with RF-kill;
parents f859b4af 0232d2cd

drivers/net/wireless/intel/iwlwifi/fw/api/txq.h

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ 
 * @IWL_MVM_DQA_CMD_QUEUE: a queue reserved for sending HCMDs to the FW

 * @IWL_MVM_DQA_AUX_QUEUE: a queue reserved for aux frames

 * @IWL_MVM_DQA_P2P_DEVICE_QUEUE: a queue reserved for P2P device frames

 * @IWL_MVM_DQA_INJECT_MONITOR_QUEUE: a queue reserved for injection using

 *	monitor mode. Note this queue is the same as the queue for P2P device

 *	but we can't have active monitor mode along with P2P device anyway.

 * @IWL_MVM_DQA_GCAST_QUEUE: a queue reserved for P2P GO/SoftAP GCAST frames

 * @IWL_MVM_DQA_BSS_CLIENT_QUEUE: a queue reserved for BSS activity, to ensure

 *	that we are never left without the possibility to connect to an AP.
@@ -87,6 +90,7 @@ enum iwl_mvm_dqa_txq { 
	IWL_MVM_DQA_CMD_QUEUE = 0,

	IWL_MVM_DQA_AUX_QUEUE = 1,

	IWL_MVM_DQA_P2P_DEVICE_QUEUE = 2,

	IWL_MVM_DQA_INJECT_MONITOR_QUEUE = 2,

	IWL_MVM_DQA_GCAST_QUEUE = 3,

	IWL_MVM_DQA_BSS_CLIENT_QUEUE = 4,

	IWL_MVM_DQA_MIN_MGMT_QUEUE = 5,

drivers/net/wireless/intel/iwlwifi/fw/dbg.h

+0 −2
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ static inline void iwl_fw_dbg_stop_recording(struct iwl_fw_runtime *fwrt) 


static inline void iwl_fw_dump_conf_clear(struct iwl_fw_runtime *fwrt)

{

	iwl_fw_dbg_stop_recording(fwrt);



	fwrt->dump.conf = FW_DBG_INVALID;

}

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm, 
					 u32 action)

{

	struct iwl_mac_ctx_cmd cmd = {};

	u32 tfd_queue_msk = 0;

	u32 tfd_queue_msk = BIT(mvm->snif_queue);

	int ret;



	WARN_ON(vif->type != NL80211_IFTYPE_MONITOR);

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

+1 −0
Original line number Diff line number Diff line
@@ -972,6 +972,7 @@ struct iwl_mvm { 


	/* Tx queues */

	u16 aux_queue;

	u16 snif_queue;

	u16 probe_queue;

	u16 p2p_dev_queue;

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

+1 −0
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	mvm->fw_restart = iwlwifi_mod_params.fw_restart ? -1 : 0;



	mvm->aux_queue = IWL_MVM_DQA_AUX_QUEUE;

	mvm->snif_queue = IWL_MVM_DQA_INJECT_MONITOR_QUEUE;

	mvm->probe_queue = IWL_MVM_DQA_AP_PROBE_RESP_QUEUE;

	mvm->p2p_dev_queue = IWL_MVM_DQA_P2P_DEVICE_QUEUE;