
* mac80211: fix HT40 mode for 6G band The channel offset used for VHT segment calculation was missing for HT Signed-off-by: Felix Fietkau <nbd@nbd.name> * mac80211: refresh patch Signed-off-by: Felix Fietkau <nbd@nbd.name> * mac80211: add missing change for encap offload on devices with sw rate control Signed-off-by: Felix Fietkau <nbd@nbd.name> * ath9k: owl-loader: remove obsolete AR71XX patch this is no longer necessary as the AR71XX target was superseded by ath79. Signed-off-by: Christian Lamparter <chunkeey@gmail.com> * mac80211: revert faulty change that was breaking broadcast tx Fixes: 0f6887972adc ("mac80211: add missing change for encap offload on devices with sw rate control") Signed-off-by: Felix Fietkau <nbd@nbd.name> * mac80211: Update to backports-5.10.68 Refresh all patches. The removed patches were integrated upstream. This contains fixes for CVE-2020-3702 1. These patches (ath, ath9k, mac80211) were included in kernel versions since 4.14.245 and 4.19.205. They fix security vulnerability CVE-2020-3702 [1] similar to KrØØk, which was found by ESET [2]. Thank you Josef Schlehofer for reporting this problem. [1] https://nvd.nist.gov/vuln/detail/CVE-2020-3702 [2] https://www.welivesecurity.com/2020/08/06/beyond-kr00k-even-more-wifi-chips-vulnerable-eavesdropping/ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * mac80211: backport support for BSS color changes This is needed for an upcoming mt76 update Signed-off-by: Felix Fietkau <nbd@nbd.name> Co-authored-by: Felix Fietkau <nbd@nbd.name> Co-authored-by: Christian Lamparter <chunkeey@gmail.com> Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
686 B
Diff
35 lines
686 B
Diff
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -1140,25 +1140,25 @@ static int __init ath9k_init(void)
|
|
{
|
|
int error;
|
|
|
|
- error = ath_pci_init();
|
|
+ error = ath_ahb_init();
|
|
if (error < 0) {
|
|
- pr_err("No PCI devices found, driver not installed\n");
|
|
error = -ENODEV;
|
|
goto err_out;
|
|
}
|
|
|
|
- error = ath_ahb_init();
|
|
+ error = ath_pci_init();
|
|
if (error < 0) {
|
|
+ pr_err("No PCI devices found, driver not installed\n");
|
|
error = -ENODEV;
|
|
- goto err_pci_exit;
|
|
+ goto err_ahb_exit;
|
|
}
|
|
|
|
dmi_check_system(ath9k_quirks);
|
|
|
|
return 0;
|
|
|
|
- err_pci_exit:
|
|
- ath_pci_exit();
|
|
+ err_ahb_exit:
|
|
+ ath_ahb_exit();
|
|
err_out:
|
|
return error;
|
|
}
|