summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-xtreme/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-01-24 00:08:11 -0300
committerDavid P <megver83@parabola.nu>2020-01-24 00:08:11 -0300
commit41a7ce9bcea2cff5a7aeb8095639d899e6859134 (patch)
treec96139c86a9d9f62609f9f40348f30b180960da5 /kernels/linux-libre-xtreme/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
parent75d02d599d1d041607af05ef3e3444c3295f24e5 (diff)
downloadabslibre-41a7ce9bcea2cff5a7aeb8095639d899e6859134.tar.gz
abslibre-41a7ce9bcea2cff5a7aeb8095639d899e6859134.tar.bz2
abslibre-41a7ce9bcea2cff5a7aeb8095639d899e6859134.zip
updpkg: kernels/linux-libre-xtreme 5.4.13-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'kernels/linux-libre-xtreme/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch')
-rw-r--r--kernels/linux-libre-xtreme/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/kernels/linux-libre-xtreme/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/kernels/linux-libre-xtreme/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
new file mode 100644
index 000000000..c521a2baf
--- /dev/null
+++ b/kernels/linux-libre-xtreme/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -0,0 +1,36 @@
+From e2842366b3a552a92584adf926eed813baeb6c68 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 24 Dec 2019 05:18:47 +0100
+Subject: [PATCH 06/14] iwlwifi: pcie: restore support for Killer Qu C0 NICs
+
+Commit 809805a820c6 refactored the cfg mangling. Unfortunately, in this
+process the lines which picked the right cfg for Killer Qu C0 NICs after
+C0 detection were lost. These lines were added by commit b9500577d361.
+
+I suspect this is more of the "merge damage" which commit 7cded5658329
+talks about.
+
+Fixes: 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from trans_pcie_alloc to probe")
+Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+---
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+index b0b7eca1754e..de62a6dc4e73 100644
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+@@ -1107,6 +1107,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ cfg = &iwl9560_2ac_cfg_qu_c0_jf_b0;
+ else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
+ cfg = &iwl9560_2ac_160_cfg_qu_c0_jf_b0;
++ else if (cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0)
++ cfg = &killer1650s_2ax_cfg_qu_c0_hr_b0;
++ else if (cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0)
++ cfg = &killer1650i_2ax_cfg_qu_c0_hr_b0;
+ }
+
+ /* same thing for QuZ... */
+--
+2.25.0
+