jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_supplicant: Rename wpas_event_*() to wpas_ap_event_*()

Browse source 
Rename DFS event handling functions, since they are located in ap.c and
refer to AP-mode only. Needed to add some STA-mode DFS event handling.

Signed-off-by: Dmitry Lebed <dlebed@quantenna.com>
This commit is contained in:
Dmitry Lebed 2018-04-04 23:44:07 +03:00 committed by Jouni Malinen
parent f875da0448
commit 2dd5fbbff8
3 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wpa_supplicant/ap.c
View file

@ -1528,8 +1528,8 @@ int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd)
#ifdef NEED_AP_MLME #ifdef NEED_AP_MLME
void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
struct dfs_event *radar) struct dfs_event *radar)
{ {
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return; return;
@ -1541,8 +1541,8 @@ void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
} }
void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
struct dfs_event *radar) struct dfs_event *radar)
{ {
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return; return;
@ -1553,8 +1553,8 @@ void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
} }
void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar) struct dfs_event *radar)
{ {
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return; return;
@ -1565,8 +1565,8 @@ void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
} }
void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
struct dfs_event *radar) struct dfs_event *radar)
{ {
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return; return;
@ -1577,8 +1577,8 @@ void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
} }
void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar) struct dfs_event *radar)
{ {
if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
return; return;

18
wpa_supplicant/ap.h
View file

@ -89,16 +89,16 @@ int wpas_ap_pmksa_cache_list_mesh(struct wpa_supplicant *wpa_s, const u8 *addr,
char *buf, size_t len); char *buf, size_t len);
int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd); int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd);
void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, 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,
struct dfs_event *radar); struct dfs_event *radar);
void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar); struct dfs_event *radar);
void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
struct dfs_event *radar); struct dfs_event *radar);
void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
struct dfs_event *radar); 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); void ap_periodic(struct wpa_supplicant *wpa_s);

13
wpa_supplicant/events.c
View file

@ -4183,24 +4183,25 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
#ifdef NEED_AP_MLME #ifdef NEED_AP_MLME
case EVENT_DFS_RADAR_DETECTED: case EVENT_DFS_RADAR_DETECTED:
if (data) if (data)
wpas_event_dfs_radar_detected(wpa_s, &data->dfs_event); wpas_ap_event_dfs_radar_detected(wpa_s,
&data->dfs_event);
break; break;
case EVENT_DFS_CAC_STARTED: case EVENT_DFS_CAC_STARTED:
if (data) if (data)
wpas_event_dfs_cac_started(wpa_s, &data->dfs_event); wpas_ap_event_dfs_cac_started(wpa_s, &data->dfs_event);
break; break;
case EVENT_DFS_CAC_FINISHED: case EVENT_DFS_CAC_FINISHED:
if (data) if (data)
wpas_event_dfs_cac_finished(wpa_s, &data->dfs_event); wpas_ap_event_dfs_cac_finished(wpa_s, &data->dfs_event);
break; break;
case EVENT_DFS_CAC_ABORTED: case EVENT_DFS_CAC_ABORTED:
if (data) if (data)
wpas_event_dfs_cac_aborted(wpa_s, &data->dfs_event); wpas_ap_event_dfs_cac_aborted(wpa_s, &data->dfs_event);
break; break;
case EVENT_DFS_NOP_FINISHED: case EVENT_DFS_NOP_FINISHED:
if (data) if (data)
wpas_event_dfs_cac_nop_finished(wpa_s, wpas_ap_event_dfs_cac_nop_finished(wpa_s,
&data->dfs_event); &data->dfs_event);
break; break;
#endif /* NEED_AP_MLME */ #endif /* NEED_AP_MLME */
#endif /* CONFIG_AP */ #endif /* CONFIG_AP */