diff options
author | Andrzej Zawadzki | 2019-09-24 11:31:07 (GMT) |
---|---|---|
committer | Andrzej Zawadzki | 2019-09-24 11:31:07 (GMT) |
commit | f1a9c9c5ee9a7e0d19e4ce577d48b155e08553ca (patch) | |
tree | f64dd1cde184f29359c835f39b9c75ff673df276 /kernel-small_fixes.patch | |
parent | 33dc26b76b1e12e75e019b1af4e6c53208ff7191 (diff) | |
download | kernel-f1a9c9c5ee9a7e0d19e4ce577d48b155e08553ca.zip kernel-f1a9c9c5ee9a7e0d19e4ce577d48b155e08553ca.tar.gz |
- fix for https://bugzilla.kernel.org/show_bug.cgi?id=204151
Diffstat (limited to 'kernel-small_fixes.patch')
-rw-r--r-- | kernel-small_fixes.patch | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 6467050..fcb13ed 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -1,2 +1,21 @@ -; -; +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +index 014eca6596e2..32a5e4e5461f 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +@@ -889,11 +889,13 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm) + * firmware versions. Unfortunately, we don't have a TLV API + * flag to rely on, so rely on the major version which is in + * the first byte of ucode_ver. This was implemented +- * initially on version 38 and then backported to 36, 29 and +- * 17. ++ * initially on version 38 and then backported to29 and 17. ++ * The intention was to have it in 36 as well, but not all ++ * 8000 family got this feature enabled. The 8000 family is ++ * the only one using version 36, so skip this version ++ * entirely. + */ + return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 || +- IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 36 || + IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 || + IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17; + } |