diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2015-11-27 11:40:36 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2015-12-24 19:35:54 (GMT) |
| commit | 96bc5086846939563022cb7a35273a1c1fdd8e4a (patch) | |
| tree | 7e3769262c02b22d6d6da652c90514beb6de7080 | |
| parent | be9fe3d8aff394ea6868f1a2347e8c12609b086e (diff) | |
| download | hostap-96bc5086846939563022cb7a35273a1c1fdd8e4a.zip hostap-96bc5086846939563022cb7a35273a1c1fdd8e4a.tar.gz hostap-96bc5086846939563022cb7a35273a1c1fdd8e4a.tar.bz2 | |
Handle survey event properly in wpa_supplicant
Let's reuse hostapd code for such handling. This will be useful to get
ACS support into wpa_supplicant where this one needs to handle the
survey event so it fills in the result ACS subsystem will require.
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
[u.oelmann@pengutronix.de: rebased series from hostap_2_1~944 to master]
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
| -rw-r--r-- | src/ap/drv_callbacks.c | 10 | ||||
| -rw-r--r-- | src/ap/hostapd.h | 3 | ||||
| -rw-r--r-- | wpa_supplicant/events.c | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index fd07201..9208569 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -945,6 +945,8 @@ static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src, ieee802_1x_receive(hapd, src, data, data_len); } +#endif /* HOSTAPD */ + static struct hostapd_channel_data * hostapd_get_mode_channel( struct hostapd_iface *iface, unsigned int freq) @@ -1019,10 +1021,9 @@ static void hostapd_single_channel_get_survey(struct hostapd_iface *iface, } -static void hostapd_event_get_survey(struct hostapd_data *hapd, - struct survey_results *survey_results) +void hostapd_event_get_survey(struct hostapd_iface *iface, + struct survey_results *survey_results) { - struct hostapd_iface *iface = hapd->iface; struct freq_survey *survey, *tmp; struct hostapd_channel_data *chan; @@ -1054,6 +1055,7 @@ static void hostapd_event_get_survey(struct hostapd_data *hapd, } +#ifdef HOSTAPD #ifdef NEED_AP_MLME static void hostapd_event_iface_unavailable(struct hostapd_data *hapd) @@ -1261,7 +1263,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, data->connect_failed_reason.code); break; case EVENT_SURVEY: - hostapd_event_get_survey(hapd, &data->survey_results); + hostapd_event_get_survey(hapd->iface, &data->survey_results); break; #ifdef NEED_AP_MLME case EVENT_INTERFACE_UNAVAILABLE: diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h index 8161a59..a664644 100644 --- a/src/ap/hostapd.h +++ b/src/ap/hostapd.h @@ -493,6 +493,9 @@ int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da, int ssi_signal); void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht, int offset, int width, int cf1, int cf2); +struct survey_results; +void hostapd_event_get_survey(struct hostapd_iface *iface, + struct survey_results *survey_results); const struct hostapd_eap_user * hostapd_get_eap_user(struct hostapd_data *hapd, const u8 *identity, diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 5e8ebad..43f3d9b 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3938,6 +3938,14 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, data->mesh_peer.ie_len); #endif /* CONFIG_MESH */ break; + case EVENT_SURVEY: +#ifdef CONFIG_AP + if (!wpa_s->ap_iface) + break; + hostapd_event_get_survey(wpa_s->ap_iface, + &data->survey_results); +#endif /* CONFIG_AP */ + break; default: wpa_msg(wpa_s, MSG_INFO, "Unknown event %d", event); break; |