Nick Hainke
20d6296141
Remove upstreamed patch: - 001-RSN-Fix-pmksa_cache_flush-prototype-mismatch-in-non-.patch -> https://git.w1.fi/cgit/hostap/commit/?id=f54565c6293d03bf7da5b7c4af496a62c51f0aaf Tested-By: Daniel Pawlik <pawlik.dan@gmail.com> Link: https://github.com/openwrt/openwrt/pull/22578 Signed-off-by: Nick Hainke <vincent@systemli.org>
52 lines
1.2 KiB
Diff
52 lines
1.2 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 28 Jan 2019 21:36:44 +0100
|
|
Subject: [PATCH] wpa_supplicant: fix calling channel switch via wpa_cli on
|
|
mesh interfaces
|
|
|
|
--- a/wpa_supplicant/ap.c
|
|
+++ b/wpa_supplicant/ap.c
|
|
@@ -1863,6 +1863,21 @@ int ap_switch_channel(struct wpa_supplic
|
|
|
|
|
|
#ifdef CONFIG_CTRL_IFACE
|
|
+
|
|
+static int __ap_ctrl_iface_chanswitch(struct hostapd_iface *iface,
|
|
+ struct csa_settings *settings)
|
|
+{
|
|
+#ifdef NEED_AP_MLME
|
|
+ if (!iface || !iface->bss[0])
|
|
+ return 0;
|
|
+
|
|
+ return hostapd_switch_channel(iface->bss[0], settings);
|
|
+#else
|
|
+ return -1;
|
|
+#endif
|
|
+}
|
|
+
|
|
+
|
|
int ap_ctrl_iface_chanswitch(struct wpa_supplicant *wpa_s, const char *pos)
|
|
{
|
|
struct csa_settings settings;
|
|
@@ -1882,12 +1897,18 @@ int ap_ctrl_iface_chanswitch(struct wpa_
|
|
return -1;
|
|
|
|
ret = hostapd_parse_csa_settings(iface, pos, &settings);
|
|
- if (ret)
|
|
- return ret;
|
|
+
|
|
+ if (!(wpa_s->ap_iface && wpa_s->ap_iface->bss[0]) &&
|
|
+ !(wpa_s->ifmsh && wpa_s->ifmsh->bss[0]))
|
|
+ return -1;
|
|
|
|
settings.link_id = -1;
|
|
|
|
- return ap_switch_channel(wpa_s, &settings);
|
|
+ ret = __ap_ctrl_iface_chanswitch(wpa_s->ap_iface, &settings);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ return __ap_ctrl_iface_chanswitch(wpa_s->ifmsh, &settings);
|
|
}
|
|
#endif /* CONFIG_CTRL_IFACE */
|
|
|