From ea210b9f8a28962559a6ec9f171b7cf20c841e87 Mon Sep 17 00:00:00 2001 From: Max Stepanov Date: Thu, 2 Jul 2015 10:45:00 +0300 Subject: [PATCH] P2P: Refactor p2p_process_prov_disc_resp() function Add 'else if' to P2PS status verification to prevent a redundant condition checking. The first 'if' condition is true only if status == P2P_SC_SUCCESS || status == P2P_SC_SUCCESS_DEFERRED. while the second condition checks: status != P2P_SC_SUCCESS && status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE && status != P2P_SC_SUCCESS_DEFERRED Thus, the two conditions are mutually exclusive and 'else if' can be used if this case. Signed-off-by: Max Stepanov Reviewed-by: Ilan Peer --- src/p2p/p2p_pd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c index ba01da145..1b2706387 100644 --- a/src/p2p/p2p_pd.c +++ b/src/p2p/p2p_pd.c @@ -920,11 +920,9 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa, msg.persistent_ssid_len, 1, 0, NULL); } p2ps_prov_free(p2p); - } - - if (status != P2P_SC_SUCCESS && - status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE && - status != P2P_SC_SUCCESS_DEFERRED && p2p->p2ps_prov) { + } else if (status != P2P_SC_SUCCESS && + status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE && + status != P2P_SC_SUCCESS_DEFERRED && p2p->p2ps_prov) { if (p2p->cfg->p2ps_prov_complete) p2p->cfg->p2ps_prov_complete( p2p->cfg->cb_ctx, status, sa, adv_mac,