|
@@ -119,7 +119,7 @@ static void wpas_p2p_group_formation_timeout(void *eloop_ctx,
|
|
|
static void wpas_p2p_group_freq_conflict(void *eloop_ctx, void *timeout_ctx);
|
|
|
static void wpas_p2p_fallback_to_go_neg(struct wpa_supplicant *wpa_s,
|
|
|
int group_added);
|
|
|
-static int wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s);
|
|
|
+static void wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s);
|
|
|
static void wpas_stop_listen(void *ctx);
|
|
|
static void wpas_p2p_psk_failure_removal(void *eloop_ctx, void *timeout_ctx);
|
|
|
static void wpas_p2p_group_deinit(struct wpa_supplicant *wpa_s);
|
|
@@ -5773,7 +5773,7 @@ int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout,
|
|
|
}
|
|
|
|
|
|
|
|
|
-static int wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s)
|
|
|
+static void wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s)
|
|
|
{
|
|
|
wpas_p2p_clear_pending_action_tx(wpa_s);
|
|
|
wpa_s->p2p_long_listen = 0;
|
|
@@ -5782,15 +5782,12 @@ static int wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s)
|
|
|
|
|
|
if (wpa_s->global->p2p)
|
|
|
p2p_stop_find(wpa_s->global->p2p);
|
|
|
-
|
|
|
- return 0;
|
|
|
}
|
|
|
|
|
|
|
|
|
void wpas_p2p_stop_find(struct wpa_supplicant *wpa_s)
|
|
|
{
|
|
|
- if (wpas_p2p_stop_find_oper(wpa_s) > 0)
|
|
|
- return;
|
|
|
+ wpas_p2p_stop_find_oper(wpa_s);
|
|
|
wpas_p2p_remove_pending_group_interface(wpa_s);
|
|
|
}
|
|
|
|