summarylogtreecommitdiffstats
path: root/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
diff options
context:
space:
mode:
authorgraysky2020-04-04 10:00:33 -0400
committergraysky2020-04-04 10:00:33 -0400
commit1bb996eb23a3f60443a99c68fa3a5bb343a3c022 (patch)
treec11ef62c5527e9c88940356b32a8a540bf72bcf3 /0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
parent854e5acb35b8af5ca17d239721d3a8870e687dc5 (diff)
downloadaur-1bb996eb23a3f60443a99c68fa3a5bb343a3c022.tar.gz
Update to 5.6.2rc1-1
Diffstat (limited to '0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch')
-rw-r--r--0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
deleted file mode 100644
index a619a93d27d..00000000000
--- a/0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 09ad81782f04168200af2f7dc4345830bfee9eef Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 24 Dec 2019 06:16:39 +0100
-Subject: [PATCH 02/13] iwlwifi: pcie: restore support for Killer Qu C0 NICs
-
-Commit 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from
-trans_pcie_alloc to probe") 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 ("iwlwifi: pcie: handle switching killer Qu B0 NICs to
-C0").
-
-I suspect this is more of the "merge damage" which commit 7cded5658329
-("iwlwifi: pcie: fix merge damage on making QnJ exclusive") talks about.
-
-Restore the missing lines so the driver loads the right firmware for
-these NICs.
-
-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.26.0
-