aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/ath10k-ct
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-11-13 20:14:09 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-02-14 15:15:29 +0100
commit12424edff53590b989761c61aefc4ae36184447e (patch)
tree35822cf3be93e5240dfad2459e6b5f496a7d62e3 /package/kernel/ath10k-ct
parentbf6f7cf29bdbf1fcd1176184d759d2a51a17b730 (diff)
downloadupstream-12424edff53590b989761c61aefc4ae36184447e.tar.gz
upstream-12424edff53590b989761c61aefc4ae36184447e.tar.bz2
upstream-12424edff53590b989761c61aefc4ae36184447e.zip
mac80211: Update to version 5.10-rc6-1
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>
Diffstat (limited to 'package/kernel/ath10k-ct')
-rw-r--r--package/kernel/ath10k-ct/patches/300-mac80211-5.10.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/package/kernel/ath10k-ct/patches/300-mac80211-5.10.patch b/package/kernel/ath10k-ct/patches/300-mac80211-5.10.patch
new file mode 100644
index 0000000000..52d639291b
--- /dev/null
+++ b/package/kernel/ath10k-ct/patches/300-mac80211-5.10.patch
@@ -0,0 +1,24 @@
+--- 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)