You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
177 lines
6.1 KiB
Diff
177 lines
6.1 KiB
Diff
From 9a8ca54a264a2820af614043e7af853166b320b0 Mon Sep 17 00:00:00 2001
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
|
Date: Tue, 29 May 2018 14:39:14 -0700
|
|
Subject: [PATCH 10/18] mesh: consider mesh interface on dfs event handler
|
|
|
|
Once mesh starts supporting DFS channels, it has to handle DFS related events
|
|
from drivers, hence add mesh interface to the check list.
|
|
|
|
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
|
|
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
|
|
---
|
|
wpa_supplicant/ap.c | 71 ++++++++++++++++++++++++++++++-----------
|
|
wpa_supplicant/events.c | 7 ++--
|
|
2 files changed, 57 insertions(+), 21 deletions(-)
|
|
|
|
--- a/wpa_supplicant/ap.c
|
|
+++ b/wpa_supplicant/ap.c
|
|
@@ -1337,13 +1337,18 @@ int ap_ctrl_iface_chanswitch(struct wpa_
|
|
void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht,
|
|
int offset, int width, int cf1, int cf2)
|
|
{
|
|
- if (!wpa_s->ap_iface)
|
|
- return;
|
|
+ struct hostapd_iface *iface = wpa_s->ap_iface;
|
|
|
|
+ if (!wpa_s->ap_iface) {
|
|
+ if (!wpa_s->ifmsh)
|
|
+ return;
|
|
+ else
|
|
+ iface = wpa_s->ifmsh;
|
|
+ }
|
|
wpa_s->assoc_freq = freq;
|
|
if (wpa_s->current_ssid)
|
|
wpa_s->current_ssid->frequency = freq;
|
|
- hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht,
|
|
+ hostapd_event_ch_switch(iface->bss[0], freq, ht,
|
|
offset, width, cf1, cf2);
|
|
}
|
|
|
|
@@ -1540,10 +1545,16 @@ int wpas_ap_pmksa_cache_add_external(str
|
|
void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
|
|
struct dfs_event *radar)
|
|
{
|
|
- if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
|
|
- return;
|
|
+ struct hostapd_iface *iface = wpa_s->ap_iface;
|
|
+
|
|
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) {
|
|
+ if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0])
|
|
+ return;
|
|
+ else
|
|
+ iface = wpa_s->ifmsh;
|
|
+ }
|
|
wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq);
|
|
- hostapd_dfs_radar_detected(wpa_s->ap_iface, radar->freq,
|
|
+ hostapd_dfs_radar_detected(iface, radar->freq,
|
|
radar->ht_enabled, radar->chan_offset,
|
|
radar->chan_width,
|
|
radar->cf1, radar->cf2);
|
|
@@ -1553,10 +1564,16 @@ void wpas_ap_event_dfs_radar_detected(st
|
|
void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
|
|
struct dfs_event *radar)
|
|
{
|
|
- if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
|
|
- return;
|
|
+ struct hostapd_iface *iface = wpa_s->ap_iface;
|
|
+
|
|
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) {
|
|
+ if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0])
|
|
+ return;
|
|
+ else
|
|
+ iface = wpa_s->ifmsh;
|
|
+ }
|
|
wpa_printf(MSG_DEBUG, "DFS CAC started on %d MHz", radar->freq);
|
|
- hostapd_dfs_start_cac(wpa_s->ap_iface, radar->freq,
|
|
+ hostapd_dfs_start_cac(iface, radar->freq,
|
|
radar->ht_enabled, radar->chan_offset,
|
|
radar->chan_width, radar->cf1, radar->cf2);
|
|
}
|
|
@@ -1565,10 +1582,16 @@ void wpas_ap_event_dfs_cac_started(struc
|
|
void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
|
|
struct dfs_event *radar)
|
|
{
|
|
- if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
|
|
- return;
|
|
+ struct hostapd_iface *iface = wpa_s->ap_iface;
|
|
+
|
|
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) {
|
|
+ if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0])
|
|
+ return;
|
|
+ else
|
|
+ iface = wpa_s->ifmsh;
|
|
+ }
|
|
wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq);
|
|
- hostapd_dfs_complete_cac(wpa_s->ap_iface, 1, radar->freq,
|
|
+ hostapd_dfs_complete_cac(iface, 1, radar->freq,
|
|
radar->ht_enabled, radar->chan_offset,
|
|
radar->chan_width, radar->cf1, radar->cf2);
|
|
}
|
|
@@ -1577,10 +1600,16 @@ void wpas_ap_event_dfs_cac_finished(stru
|
|
void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
|
|
struct dfs_event *radar)
|
|
{
|
|
- if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
|
|
- return;
|
|
+ struct hostapd_iface *iface = wpa_s->ap_iface;
|
|
+
|
|
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) {
|
|
+ if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0])
|
|
+ return;
|
|
+ else
|
|
+ iface = wpa_s->ifmsh;
|
|
+ }
|
|
wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq);
|
|
- hostapd_dfs_complete_cac(wpa_s->ap_iface, 0, radar->freq,
|
|
+ hostapd_dfs_complete_cac(iface, 0, radar->freq,
|
|
radar->ht_enabled, radar->chan_offset,
|
|
radar->chan_width, radar->cf1, radar->cf2);
|
|
}
|
|
@@ -1589,10 +1618,16 @@ void wpas_ap_event_dfs_cac_aborted(struc
|
|
void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
|
|
struct dfs_event *radar)
|
|
{
|
|
- if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
|
|
- return;
|
|
+ struct hostapd_iface *iface = wpa_s->ap_iface;
|
|
+
|
|
+ if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) {
|
|
+ if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0])
|
|
+ return;
|
|
+ else
|
|
+ iface = wpa_s->ifmsh;
|
|
+ }
|
|
wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq);
|
|
- hostapd_dfs_nop_finished(wpa_s->ap_iface, radar->freq,
|
|
+ hostapd_dfs_nop_finished(iface, radar->freq,
|
|
radar->ht_enabled, radar->chan_offset,
|
|
radar->chan_width, radar->cf1, radar->cf2);
|
|
}
|
|
--- a/wpa_supplicant/events.c
|
|
+++ b/wpa_supplicant/events.c
|
|
@@ -3802,7 +3802,7 @@ static void wpas_event_dfs_cac_started(s
|
|
struct dfs_event *radar)
|
|
{
|
|
#if defined(NEED_AP_MLME) && defined(CONFIG_AP)
|
|
- if (wpa_s->ap_iface) {
|
|
+ if (wpa_s->ap_iface || wpa_s->ifmsh) {
|
|
wpas_ap_event_dfs_cac_started(wpa_s, radar);
|
|
} else
|
|
#endif /* NEED_AP_MLME && CONFIG_AP */
|
|
@@ -3823,7 +3823,7 @@ static void wpas_event_dfs_cac_finished(
|
|
struct dfs_event *radar)
|
|
{
|
|
#if defined(NEED_AP_MLME) && defined(CONFIG_AP)
|
|
- if (wpa_s->ap_iface) {
|
|
+ if (wpa_s->ap_iface || wpa_s->ifmsh) {
|
|
wpas_ap_event_dfs_cac_finished(wpa_s, radar);
|
|
} else
|
|
#endif /* NEED_AP_MLME && CONFIG_AP */
|
|
@@ -3839,7 +3839,7 @@ static void wpas_event_dfs_cac_aborted(s
|
|
struct dfs_event *radar)
|
|
{
|
|
#if defined(NEED_AP_MLME) && defined(CONFIG_AP)
|
|
- if (wpa_s->ap_iface) {
|
|
+ if (wpa_s->ap_iface || wpa_s->ifmsh) {
|
|
wpas_ap_event_dfs_cac_aborted(wpa_s, radar);
|
|
} else
|
|
#endif /* NEED_AP_MLME && CONFIG_AP */
|
|
@@ -4278,6 +4278,7 @@ void wpa_supplicant_event(void *ctx, enu
|
|
#ifdef CONFIG_AP
|
|
if (wpa_s->current_ssid->mode == WPAS_MODE_AP ||
|
|
wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO ||
|
|
+ wpa_s->current_ssid->mode == WPAS_MODE_MESH ||
|
|
wpa_s->current_ssid->mode ==
|
|
WPAS_MODE_P2P_GROUP_FORMATION) {
|
|
wpas_ap_ch_switch(wpa_s, data->ch_switch.freq,
|