Clean up conflicts/provides/depends hell and add PROVIDES for eapol-test variants while at it. Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which allows to drop two revert-patches for upstream commits which previously were necessary to un-break mesh-DFS support. Signed-off-by: Daniel Golle <daniel@makrotopia.org>master
parent
dad39249fb
commit
78f1974bc5
@ -1,185 +0,0 @@ |
||||
From 8a6a7112e5b1391018531f6b6c317f8870e0fcb6 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Golle <daniel@makrotopia.org>
|
||||
Date: Thu, 3 May 2018 13:12:28 +0200
|
||||
Subject: [PATCH 1/2] Revert "wpa_supplicant: Increase authentication timeout
|
||||
if CAC is started"
|
||||
|
||||
This reverts commit 37547ad63c9df61ce6899675028594da2527efef.
|
||||
---
|
||||
wpa_supplicant/events.c | 95 ++++---------------------------
|
||||
wpa_supplicant/wpa_supplicant.c | 20 -------
|
||||
wpa_supplicant/wpa_supplicant_i.h | 3 -
|
||||
3 files changed, 10 insertions(+), 108 deletions(-)
|
||||
|
||||
--- a/wpa_supplicant/events.c
|
||||
+++ b/wpa_supplicant/events.c
|
||||
@@ -3776,81 +3776,6 @@ static void wpa_supplicant_event_port_au
|
||||
}
|
||||
|
||||
|
||||
-static unsigned int wpas_event_cac_ms(const struct wpa_supplicant *wpa_s,
|
||||
- int freq)
|
||||
-{
|
||||
- size_t i;
|
||||
- int j;
|
||||
-
|
||||
- for (i = 0; i < wpa_s->hw.num_modes; i++) {
|
||||
- const struct hostapd_hw_modes *mode = &wpa_s->hw.modes[i];
|
||||
-
|
||||
- for (j = 0; j < mode->num_channels; j++) {
|
||||
- const struct hostapd_channel_data *chan;
|
||||
-
|
||||
- chan = &mode->channels[j];
|
||||
- if (chan->freq == freq)
|
||||
- return chan->dfs_cac_ms;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-
|
||||
-static void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar)
|
||||
-{
|
||||
-#if defined(NEED_AP_MLME) && defined(CONFIG_AP)
|
||||
- if (wpa_s->ap_iface) {
|
||||
- wpas_ap_event_dfs_cac_started(wpa_s, radar);
|
||||
- } else
|
||||
-#endif /* NEED_AP_MLME && CONFIG_AP */
|
||||
- {
|
||||
- unsigned int cac_time = wpas_event_cac_ms(wpa_s, radar->freq);
|
||||
-
|
||||
- cac_time /= 1000; /* convert from ms to sec */
|
||||
- if (!cac_time)
|
||||
- cac_time = 10 * 60; /* max timeout: 10 minutes */
|
||||
-
|
||||
- /* Restart auth timeout: CAC time added to initial timeout */
|
||||
- wpas_auth_timeout_restart(wpa_s, cac_time);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-
|
||||
-static void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar)
|
||||
-{
|
||||
-#if defined(NEED_AP_MLME) && defined(CONFIG_AP)
|
||||
- if (wpa_s->ap_iface) {
|
||||
- wpas_ap_event_dfs_cac_finished(wpa_s, radar);
|
||||
- } else
|
||||
-#endif /* NEED_AP_MLME && CONFIG_AP */
|
||||
- {
|
||||
- /* Restart auth timeout with original value after CAC is
|
||||
- * finished */
|
||||
- wpas_auth_timeout_restart(wpa_s, 0);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-
|
||||
-static void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar)
|
||||
-{
|
||||
-#if defined(NEED_AP_MLME) && defined(CONFIG_AP)
|
||||
- if (wpa_s->ap_iface) {
|
||||
- wpas_ap_event_dfs_cac_aborted(wpa_s, radar);
|
||||
- } else
|
||||
-#endif /* NEED_AP_MLME && CONFIG_AP */
|
||||
- {
|
||||
- /* Restart auth timeout with original value after CAC is
|
||||
- * aborted */
|
||||
- wpas_auth_timeout_restart(wpa_s, 0);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-
|
||||
static void wpa_supplicant_event_assoc_auth(struct wpa_supplicant *wpa_s,
|
||||
union wpa_event_data *data)
|
||||
{
|
||||
@@ -4298,25 +4223,25 @@ void wpa_supplicant_event(void *ctx, enu
|
||||
wpas_ap_event_dfs_radar_detected(wpa_s,
|
||||
&data->dfs_event);
|
||||
break;
|
||||
- case EVENT_DFS_NOP_FINISHED:
|
||||
- if (data)
|
||||
- wpas_ap_event_dfs_cac_nop_finished(wpa_s,
|
||||
- &data->dfs_event);
|
||||
- break;
|
||||
-#endif /* NEED_AP_MLME */
|
||||
-#endif /* CONFIG_AP */
|
||||
case EVENT_DFS_CAC_STARTED:
|
||||
if (data)
|
||||
- wpas_event_dfs_cac_started(wpa_s, &data->dfs_event);
|
||||
+ wpas_ap_event_dfs_cac_started(wpa_s, &data->dfs_event);
|
||||
break;
|
||||
case EVENT_DFS_CAC_FINISHED:
|
||||
if (data)
|
||||
- wpas_event_dfs_cac_finished(wpa_s, &data->dfs_event);
|
||||
+ wpas_ap_event_dfs_cac_finished(wpa_s, &data->dfs_event);
|
||||
break;
|
||||
case EVENT_DFS_CAC_ABORTED:
|
||||
if (data)
|
||||
- wpas_event_dfs_cac_aborted(wpa_s, &data->dfs_event);
|
||||
+ wpas_ap_event_dfs_cac_aborted(wpa_s, &data->dfs_event);
|
||||
+ break;
|
||||
+ case EVENT_DFS_NOP_FINISHED:
|
||||
+ if (data)
|
||||
+ wpas_ap_event_dfs_cac_nop_finished(wpa_s,
|
||||
+ &data->dfs_event);
|
||||
break;
|
||||
+#endif /* NEED_AP_MLME */
|
||||
+#endif /* CONFIG_AP */
|
||||
case EVENT_RX_MGMT: {
|
||||
u16 fc, stype;
|
||||
const struct ieee80211_mgmt *mgmt;
|
||||
--- a/wpa_supplicant/wpa_supplicant.c
|
||||
+++ b/wpa_supplicant/wpa_supplicant.c
|
||||
@@ -243,30 +243,10 @@ void wpa_supplicant_req_auth_timeout(str
|
||||
wpa_dbg(wpa_s, MSG_DEBUG, "Setting authentication timeout: %d sec "
|
||||
"%d usec", sec, usec);
|
||||
eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL);
|
||||
- wpa_s->last_auth_timeout_sec = sec;
|
||||
eloop_register_timeout(sec, usec, wpa_supplicant_timeout, wpa_s, NULL);
|
||||
}
|
||||
|
||||
|
||||
-/*
|
||||
- * wpas_auth_timeout_restart - Restart and change timeout for authentication
|
||||
- * @wpa_s: Pointer to wpa_supplicant data
|
||||
- * @sec_diff: difference in seconds applied to original timeout value
|
||||
- */
|
||||
-void wpas_auth_timeout_restart(struct wpa_supplicant *wpa_s, int sec_diff)
|
||||
-{
|
||||
- int new_sec = wpa_s->last_auth_timeout_sec + sec_diff;
|
||||
-
|
||||
- if (eloop_is_timeout_registered(wpa_supplicant_timeout, wpa_s, NULL)) {
|
||||
- wpa_dbg(wpa_s, MSG_DEBUG,
|
||||
- "Authentication timeout restart: %d sec", new_sec);
|
||||
- eloop_cancel_timeout(wpa_supplicant_timeout, wpa_s, NULL);
|
||||
- eloop_register_timeout(new_sec, 0, wpa_supplicant_timeout,
|
||||
- wpa_s, NULL);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-
|
||||
/**
|
||||
* wpa_supplicant_cancel_auth_timeout - Cancel authentication timeout
|
||||
* @wpa_s: Pointer to wpa_supplicant data
|
||||
--- a/wpa_supplicant/wpa_supplicant_i.h
|
||||
+++ b/wpa_supplicant/wpa_supplicant_i.h
|
||||
@@ -1182,8 +1182,6 @@ struct wpa_supplicant {
|
||||
/* RIC elements for FT protocol */
|
||||
struct wpabuf *ric_ies;
|
||||
|
||||
- int last_auth_timeout_sec;
|
||||
-
|
||||
#ifdef CONFIG_DPP
|
||||
struct dl_list dpp_bootstrap; /* struct dpp_bootstrap_info */
|
||||
struct dl_list dpp_configurator; /* struct dpp_configurator */
|
||||
@@ -1258,7 +1256,6 @@ void wpa_supplicant_initiate_eapol(struc
|
||||
void wpa_clear_keys(struct wpa_supplicant *wpa_s, const u8 *addr);
|
||||
void wpa_supplicant_req_auth_timeout(struct wpa_supplicant *wpa_s,
|
||||
int sec, int usec);
|
||||
-void wpas_auth_timeout_restart(struct wpa_supplicant *wpa_s, int sec_diff);
|
||||
void wpa_supplicant_reinit_autoscan(struct wpa_supplicant *wpa_s);
|
||||
void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
|
||||
enum wpa_states state);
|
@ -1,132 +0,0 @@ |
||||
From 0d4900ccd1c7ec5c5ffecf5040f9c07a6a32deef Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Golle <daniel@makrotopia.org>
|
||||
Date: Thu, 3 May 2018 13:12:35 +0200
|
||||
Subject: [PATCH 2/2] Revert "wpa_supplicant: Rename wpas_event_*() to
|
||||
wpas_ap_event_*()"
|
||||
|
||||
This reverts commit 2dd5fbbff884af488870a37e339b4817c83954de.
|
||||
---
|
||||
wpa_supplicant/ap.c | 20 ++++++++++----------
|
||||
wpa_supplicant/ap.h | 18 +++++++++---------
|
||||
wpa_supplicant/events.c | 13 ++++++-------
|
||||
3 files changed, 25 insertions(+), 26 deletions(-)
|
||||
|
||||
--- a/wpa_supplicant/ap.c
|
||||
+++ b/wpa_supplicant/ap.c
|
||||
@@ -1537,8 +1537,8 @@ int wpas_ap_pmksa_cache_add_external(str
|
||||
|
||||
|
||||
#ifdef NEED_AP_MLME
|
||||
-void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar)
|
||||
+void wpas_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;
|
||||
@@ -1550,8 +1550,8 @@ void wpas_ap_event_dfs_radar_detected(st
|
||||
}
|
||||
|
||||
|
||||
-void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar)
|
||||
+void wpas_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;
|
||||
@@ -1562,8 +1562,8 @@ void wpas_ap_event_dfs_cac_started(struc
|
||||
}
|
||||
|
||||
|
||||
-void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar)
|
||||
+void wpas_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;
|
||||
@@ -1574,8 +1574,8 @@ void wpas_ap_event_dfs_cac_finished(stru
|
||||
}
|
||||
|
||||
|
||||
-void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar)
|
||||
+void wpas_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;
|
||||
@@ -1586,8 +1586,8 @@ 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)
|
||||
+void wpas_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;
|
||||
--- a/wpa_supplicant/ap.h
|
||||
+++ b/wpa_supplicant/ap.h
|
||||
@@ -89,16 +89,16 @@ int wpas_ap_pmksa_cache_list_mesh(struct
|
||||
char *buf, size_t len);
|
||||
int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd);
|
||||
|
||||
-void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar);
|
||||
-void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
|
||||
+void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
|
||||
struct dfs_event *radar);
|
||||
-void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar);
|
||||
-void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar);
|
||||
-void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
|
||||
- struct dfs_event *radar);
|
||||
+void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
|
||||
+ struct dfs_event *radar);
|
||||
+void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
|
||||
+ struct dfs_event *radar);
|
||||
+void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
|
||||
+ struct dfs_event *radar);
|
||||
+void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
|
||||
+ struct dfs_event *radar);
|
||||
|
||||
void ap_periodic(struct wpa_supplicant *wpa_s);
|
||||
|
||||
--- a/wpa_supplicant/events.c
|
||||
+++ b/wpa_supplicant/events.c
|
||||
@@ -4220,25 +4220,24 @@ void wpa_supplicant_event(void *ctx, enu
|
||||
#ifdef NEED_AP_MLME
|
||||
case EVENT_DFS_RADAR_DETECTED:
|
||||
if (data)
|
||||
- wpas_ap_event_dfs_radar_detected(wpa_s,
|
||||
- &data->dfs_event);
|
||||
+ wpas_event_dfs_radar_detected(wpa_s, &data->dfs_event);
|
||||
break;
|
||||
case EVENT_DFS_CAC_STARTED:
|
||||
if (data)
|
||||
- wpas_ap_event_dfs_cac_started(wpa_s, &data->dfs_event);
|
||||
+ wpas_event_dfs_cac_started(wpa_s, &data->dfs_event);
|
||||
break;
|
||||
case EVENT_DFS_CAC_FINISHED:
|
||||
if (data)
|
||||
- wpas_ap_event_dfs_cac_finished(wpa_s, &data->dfs_event);
|
||||
+ wpas_event_dfs_cac_finished(wpa_s, &data->dfs_event);
|
||||
break;
|
||||
case EVENT_DFS_CAC_ABORTED:
|
||||
if (data)
|
||||
- wpas_ap_event_dfs_cac_aborted(wpa_s, &data->dfs_event);
|
||||
+ wpas_event_dfs_cac_aborted(wpa_s, &data->dfs_event);
|
||||
break;
|
||||
case EVENT_DFS_NOP_FINISHED:
|
||||
if (data)
|
||||
- wpas_ap_event_dfs_cac_nop_finished(wpa_s,
|
||||
- &data->dfs_event);
|
||||
+ wpas_event_dfs_cac_nop_finished(wpa_s,
|
||||
+ &data->dfs_event);
|
||||
break;
|
||||
#endif /* NEED_AP_MLME */
|
||||
#endif /* CONFIG_AP */
|
@ -0,0 +1,64 @@ |
||||
From fa9d565fe8841b288f29137c23a7ab2584dd9510 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oh <peter.oh@bowerswilkins.com>
|
||||
Date: Tue, 29 May 2018 14:39:20 -0700
|
||||
Subject: [PATCH 16/18] mesh: fix channel switch error during CAC
|
||||
|
||||
Mesh interface has used its channel parameters that configured
|
||||
during its initialization even after channel switched due to
|
||||
DFS radar detection during CAC which caused channel switch error.
|
||||
This change fixes the error by updating its channel parameters
|
||||
when channel's been changed from initial one.
|
||||
|
||||
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
|
||||
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
[daniel@makrotopia.org: added hw_features_common.h include]
|
||||
---
|
||||
wpa_supplicant/mesh.c | 25 +++++++++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
--- a/wpa_supplicant/mesh.c
|
||||
+++ b/wpa_supplicant/mesh.c
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "utils/common.h"
|
||||
#include "utils/eloop.h"
|
||||
#include "utils/uuid.h"
|
||||
+#include "common/hw_features_common.h"
|
||||
#include "common/ieee802_11_defs.h"
|
||||
#include "common/wpa_ctrl.h"
|
||||
#include "ap/sta_info.h"
|
||||
@@ -394,10 +395,35 @@ void wpa_supplicant_mesh_add_scan_ie(str
|
||||
void wpas_mesh_complete_cb(void *ctx)
|
||||
{
|
||||
struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx;
|
||||
+ struct hostapd_iface *ifmsh = wpa_s->ifmsh;
|
||||
struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params;
|
||||
struct wpa_ssid *ssid = wpa_s->current_ssid;
|
||||
int ret = 0;
|
||||
|
||||
+ /*
|
||||
+ * inspect if channel's been changed since initialized.
|
||||
+ * i.e. DFS radar detection
|
||||
+ */
|
||||
+ if (ifmsh->freq != params->freq.freq) {
|
||||
+ wpa_s->assoc_freq = ifmsh->freq;
|
||||
+ ssid->frequency = ifmsh->freq;
|
||||
+ if (hostapd_set_freq_params(¶ms->freq,
|
||||
+ ifmsh->conf->hw_mode,
|
||||
+ ifmsh->freq,
|
||||
+ ifmsh->conf->channel,
|
||||
+ ifmsh->conf->ieee80211n,
|
||||
+ ifmsh->conf->ieee80211ac,
|
||||
+ ifmsh->conf->secondary_channel,
|
||||
+ ifmsh->conf->vht_oper_chwidth,
|
||||
+ ifmsh->conf->vht_oper_centr_freq_seg0_idx,
|
||||
+ ifmsh->conf->vht_oper_centr_freq_seg1_idx,
|
||||
+ ifmsh->conf->vht_capab)) {
|
||||
+ wpa_printf(MSG_ERROR, "Error updating mesh frequency params.");
|
||||
+ wpa_supplicant_mesh_deinit(wpa_s);
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (wpas_mesh_init_rsn(wpa_s)) {
|
||||
wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh...");
|
||||
wpa_supplicant_mesh_deinit(wpa_s);
|
@ -0,0 +1,107 @@ |
||||
From d3201adfe7d2219217a07ef16ef365ad59c1a89b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oh <peter.oh@bowerswilkins.com>
|
||||
Date: Tue, 29 May 2018 14:39:21 -0700
|
||||
Subject: [PATCH 17/18] mesh: use right interface context to send DFS event
|
||||
messages
|
||||
|
||||
use mesh interface context to send DFS event messages when
|
||||
DFS events are on mesh interface.
|
||||
|
||||
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
|
||||
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
|
||||
---
|
||||
src/ap/dfs.c | 27 +++++++++++++++++++--------
|
||||
1 file changed, 19 insertions(+), 8 deletions(-)
|
||||
|
||||
--- a/src/ap/dfs.c
|
||||
+++ b/src/ap/dfs.c
|
||||
@@ -637,6 +637,17 @@ static unsigned int dfs_get_cac_time(str
|
||||
}
|
||||
|
||||
|
||||
+static void *get_message_ctx(struct hostapd_iface *iface)
|
||||
+{
|
||||
+#ifdef CONFIG_MESH
|
||||
+ if (iface->mconf)
|
||||
+ return iface->owner;
|
||||
+#endif /* CONFIG_MESH */
|
||||
+
|
||||
+ return iface->bss[0]->msg_ctx;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/*
|
||||
* Main DFS handler
|
||||
* 1 - continue channel/ap setup
|
||||
@@ -719,7 +730,7 @@ int hostapd_handle_dfs(struct hostapd_if
|
||||
/* Finally start CAC */
|
||||
hostapd_set_state(iface, HAPD_IFACE_DFS);
|
||||
wpa_printf(MSG_DEBUG, "DFS start CAC on %d MHz", iface->freq);
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_START
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_CAC_START
|
||||
"freq=%d chan=%d sec_chan=%d, width=%d, seg0=%d, seg1=%d, cac_time=%ds",
|
||||
iface->freq,
|
||||
iface->conf->channel, iface->conf->secondary_channel,
|
||||
@@ -768,7 +779,7 @@ int hostapd_dfs_complete_cac(struct host
|
||||
int ht_enabled, int chan_offset, int chan_width,
|
||||
int cf1, int cf2)
|
||||
{
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_COMPLETED
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_CAC_COMPLETED
|
||||
"success=%d freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
|
||||
success, freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
|
||||
|
||||
@@ -810,7 +821,7 @@ int hostapd_dfs_pre_cac_expired(struct h
|
||||
int ht_enabled, int chan_offset, int chan_width,
|
||||
int cf1, int cf2)
|
||||
{
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_PRE_CAC_EXPIRED
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_PRE_CAC_EXPIRED
|
||||
"freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
|
||||
freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
|
||||
|
||||
@@ -848,7 +859,7 @@ static int hostapd_dfs_start_channel_swi
|
||||
|
||||
wpa_printf(MSG_DEBUG, "DFS will switch to a new channel %d",
|
||||
channel->chan);
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_NEW_CHANNEL
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_NEW_CHANNEL
|
||||
"freq=%d chan=%d sec_chan=%d", channel->freq,
|
||||
channel->chan, secondary_channel);
|
||||
|
||||
@@ -935,7 +946,7 @@ static int hostapd_dfs_start_channel_swi
|
||||
|
||||
wpa_printf(MSG_DEBUG, "DFS will switch to a new channel %d",
|
||||
channel->chan);
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_NEW_CHANNEL
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_NEW_CHANNEL
|
||||
"freq=%d chan=%d sec_chan=%d", channel->freq,
|
||||
channel->chan, secondary_channel);
|
||||
|
||||
@@ -997,7 +1008,7 @@ int hostapd_dfs_radar_detected(struct ho
|
||||
{
|
||||
int res;
|
||||
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_RADAR_DETECTED
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_RADAR_DETECTED
|
||||
"freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
|
||||
freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
|
||||
|
||||
@@ -1028,7 +1039,7 @@ int hostapd_dfs_nop_finished(struct host
|
||||
int ht_enabled, int chan_offset, int chan_width,
|
||||
int cf1, int cf2)
|
||||
{
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_NOP_FINISHED
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_NOP_FINISHED
|
||||
"freq=%d ht_enabled=%d chan_offset=%d chan_width=%d cf1=%d cf2=%d",
|
||||
freq, ht_enabled, chan_offset, chan_width, cf1, cf2);
|
||||
|
||||
@@ -1078,7 +1089,7 @@ int hostapd_dfs_start_cac(struct hostapd
|
||||
int ht_enabled, int chan_offset, int chan_width,
|
||||
int cf1, int cf2)
|
||||
{
|
||||
- wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_START
|
||||
+ wpa_msg(get_message_ctx(iface), MSG_INFO, DFS_EVENT_CAC_START
|
||||
"freq=%d chan=%d chan_offset=%d width=%d seg0=%d "
|
||||
"seg1=%d cac_time=%ds",
|
||||
freq, (freq - 5000) / 5, chan_offset, chan_width, cf1, cf2, 60);
|
Loading…
Reference in new issue