mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-07 14:28:50 +00:00
1bfcc1ea8a
Brings lots of driver updates and API changes needed for mt76 updates. Disable iwlwifi and ath11k on 5.15, since backport is too difficult, and the only remaining targets won't need those drivers. Signed-off-by: Felix Fietkau <nbd@nbd.name>
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
--- a/ath10k-6.4/mac.c
|
|
+++ b/ath10k-6.4/mac.c
|
|
@@ -2310,8 +2310,8 @@ static void ath10k_mac_vif_ap_csa_count_
|
|
if (!arvif->is_up)
|
|
return;
|
|
|
|
- if (!ieee80211_beacon_cntdwn_is_complete(vif)) {
|
|
- ieee80211_beacon_update_cntdwn(vif);
|
|
+ if (!ieee80211_beacon_cntdwn_is_complete(vif, 0)) {
|
|
+ ieee80211_beacon_update_cntdwn(vif, 0);
|
|
|
|
ret = ath10k_mac_setup_bcn_tmpl(arvif);
|
|
if (ret)
|
|
@@ -2323,7 +2323,7 @@ static void ath10k_mac_vif_ap_csa_count_
|
|
ath10k_warn(ar, "failed to update prb tmpl during csa: %d\n",
|
|
ret);
|
|
} else {
|
|
- ieee80211_csa_finish(vif);
|
|
+ ieee80211_csa_finish(vif, 0);
|
|
}
|
|
}
|
|
|
|
--- a/ath10k-6.4/wmi.c
|
|
+++ b/ath10k-6.4/wmi.c
|
|
@@ -4284,8 +4284,8 @@ void ath10k_wmi_event_host_swba(struct a
|
|
* actual channel switch is done
|
|
*/
|
|
if (arvif->vif->bss_conf.csa_active &&
|
|
- ieee80211_beacon_cntdwn_is_complete(arvif->vif)) {
|
|
- ieee80211_csa_finish(arvif->vif);
|
|
+ ieee80211_beacon_cntdwn_is_complete(arvif->vif, 0)) {
|
|
+ ieee80211_csa_finish(arvif->vif, 0);
|
|
continue;
|
|
}
|
|
|