github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

* Remove an extra hyphen from a string that was preventing the firmware to load

Browse Source 
* Avoid a crash when the firmware is restarted in certain scenarios with DQA
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEF3LNfgb2BPWm68smoUecoho8xfoFAliGadAACgkQoUecoho8
 xfqdUw/+M6/NLR+Sx6E2rWQtBiRQVJAuVKgU4+VSY8uZssN8QznZha8E0fzO/JYQ
 KLYZuqm1VLbYigRRzVR1MkmR8V7M/4HgOnDjw3WZkA6fMFS8VEZZ5K65CF5ZgWuR
 RHjE/LKiW0HhrQJwTU7Mc7OAVUJ4K5TH3k3efStKWV30flIhn+gzBn6rjJkir9EV
 gevbJCNeDh2i7IlkOuDnB1Bn0QKsmByBLlHsfUl6omB6gRsJjFir/ZQEHfz9MgCo
 xi1gAcwfQyRQqXEPkNADmfLCISDqzcu7JwAAgh34fcUcJ4CzW1kNXD+WZvtbYnho
 wP7X/a0ihpsUFVIxIbvcvkMeE5riSlnWKZktPME5uGySbewuA/27JZQQOEoE4dMX
 BuZ5VgHDxfKPyqBao2pS3lVRhhv3zSCQoPKS2So8dHCT7QQV0+HhS2RvtY8gcZIb
 jxeYs0pm9nHGOMuTMkcFbzbBk27JUTDzN2OokxEYebrYqBEL3JoCL48JIMqpxNvR
 QzsWZQW3KqDZ4Swaizb3Ocb6O79TjrByrpNdmQT1cfhrHI7APIz/7Nue+ARQAZ1y
 C86LDrKEUCL/6WaJPID43XtRV5BKdKyo0D2jaPn2Zw+AeoOANc2UVHmprcnsvV/E
 Cj9UZ6nQgRQytdpcxSZbkmjkTdxqMU5uvnlLykpo4Yl6IS1dMU8=
 =IVoD
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Kalle Valo 2017-01-24 14:27:53 +02:00
commit bd19b5ab1d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/intel/iwlwifi/iwl-8000.c
View File

@ -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) \

7
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
View File

@ -1164,9 +1164,10 @@ 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) */
mvm->queue_info[mvm_sta->reserved_queue].status =
IWL_MVM_QUEUE_RESERVED;
/* 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;
for (i = 0; i <= IWL_MAX_TID_COUNT; i++) {
struct iwl_mvm_tid_data *tid_data = &mvm_sta->tid_data[i];