commit f1a9c9c5ee9a7e0d19e4ce577d48b155e08553ca
Author: Andrzej Zawadzki <zawa...@pld-linux.org>
Date: Tue Sep 24 13:31:07 2019 +0200
- fix for https://bugzilla.kernel.org/show_bug.cgi?id=204151
kernel-small_fixes.patch | 23 +++++++++++++++++++++--
kernel.spec | 4 ++--
2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 19c9b9e5..00a14a3f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define have_pcmcia 0
%endif
-%define rel 1
+%define rel 2
%define basever 5.3
%define postver .1
@@ -690,7 +690,7 @@ rm -f localversion-rt
%endif # vanilla
# Small fixes:
-#%patch2000 -p1
+%patch2000 -p1
%patch2001 -p1
#%patch2003 -p1
%patch2004 -p1
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 6467050d..fcb13ed7 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;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/f1a9c9c5ee9a7e0d19e4ce577d48b155e08553ca
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
