mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
12424edff5
The removed patches were applied upstream. This adapts ath10k-ct and mt76 to changed APIs. nl80211.h in iw is updated to match the version from backports. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
25 lines
718 B
Diff
25 lines
718 B
Diff
--- a/ath10k-5.8/wmi.c
|
|
+++ b/ath10k-5.8/wmi.c
|
|
@@ -4254,7 +4254,7 @@ void ath10k_wmi_event_host_swba(struct a
|
|
* actual channel switch is done
|
|
*/
|
|
if (arvif->vif->csa_active &&
|
|
- ieee80211_csa_is_complete(arvif->vif)) {
|
|
+ ieee80211_beacon_cntdwn_is_complete(arvif->vif)) {
|
|
ieee80211_csa_finish(arvif->vif);
|
|
continue;
|
|
}
|
|
--- a/ath10k-5.8/mac.c
|
|
+++ b/ath10k-5.8/mac.c
|
|
@@ -2295,8 +2295,8 @@ static void ath10k_mac_vif_ap_csa_count_
|
|
if (!arvif->is_up)
|
|
return;
|
|
|
|
- if (!ieee80211_csa_is_complete(vif)) {
|
|
- ieee80211_csa_update_counter(vif);
|
|
+ if (!ieee80211_beacon_cntdwn_is_complete(vif)) {
|
|
+ ieee80211_beacon_update_cntdwn(vif);
|
|
|
|
ret = ath10k_mac_setup_bcn_tmpl(arvif);
|
|
if (ret)
|