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

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

Merge tag 'iwlwifi-for-kalle-2017-01-23' of... 

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

* Remove an extra hyphen from a string that was preventing the firmware to load
* Avoid a crash when the firmware is restarted in certain scenarios with DQA
parents 92549cdc 03c902bf

drivers/net/wireless/intel/iwlwifi/iwl-8000.c

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


#define IWL8000_FW_PRE "iwlwifi-8000C-"

#define IWL8000_MODULE_FIRMWARE(api) \

	IWL8000_FW_PRE "-" __stringify(api) ".ucode"

	IWL8000_FW_PRE __stringify(api) ".ucode"



#define IWL8265_FW_PRE "iwlwifi-8265-"

#define IWL8265_MODULE_FIRMWARE(api) \

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

+4 −3
Original line number Diff line number Diff line
@@ -1164,7 +1164,8 @@ static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm, 
		.frame_limit = IWL_FRAME_LIMIT,

	};



	/* Make sure reserved queue is still marked as such (or allocated) */

	/* Make sure reserved queue is still marked as such (if allocated) */

	if (mvm_sta->reserved_queue != IEEE80211_INVAL_HW_QUEUE)

		mvm->queue_info[mvm_sta->reserved_queue].status =

			IWL_MVM_QUEUE_RESERVED;