summarylogtreecommitdiffstats
path: root/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
diff options
context:
space:
mode:
authorgraysky2020-01-05 04:33:43 -0500
committergraysky2020-01-05 04:33:43 -0500
commitb46d1751dd563b4b248d32a718b939acec980823 (patch)
tree92b42c037207ca5db0458fafc3464394533be37c /0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
parent26509a0515d4057af42849a2b17c0e9f99f5670c (diff)
downloadaur-b46d1751dd563b4b248d32a718b939acec980823.tar.gz
Update to 5.4.8-1
Diffstat (limited to '0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch')
-rw-r--r--0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
new file mode 100644
index 00000000000..5e06efc54b1
--- /dev/null
+++ b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -0,0 +1,36 @@
+From 265dae4f5dac25c15272befa5eefb9b10906435f 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 07/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.24.1
+