diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-07 14:34:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-07 14:34:23 -0800 |
| commit | e5a1cca7e0c6f0f9202634dd98044c2dde7f695b (patch) | |
| tree | 8750d4bf464db5b16793f51731660f794eaf7376 | |
| parent | 3323fc74c5572ad84b1b458dfebfd9f47ecb0f47 (diff) | |
| parent | 54f7321493d7a1241706b79702d6447012bd7a60 (diff) | |
| download | android_external_wpa_supplicant_8-e5a1cca7e0c6f0f9202634dd98044c2dde7f695b.tar.gz android_external_wpa_supplicant_8-e5a1cca7e0c6f0f9202634dd98044c2dde7f695b.tar.bz2 android_external_wpa_supplicant_8-e5a1cca7e0c6f0f9202634dd98044c2dde7f695b.zip | |
Merge "P2P: Remove unreachable code in wpas_p2p_stop_find()"
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index ddd245d3..82c153f1 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -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); @@ -5761,7 +5761,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; @@ -5770,15 +5770,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); } |