P2P: Refactor p2p_process_prov_disc_resp() function

[mech_eap.git] / src / p2p / p2p_pd.c

diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index f62c63d..1b27063 100644 (file)
--- 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,
@@ -966,8 +964,7 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
                                        p2p->cfg->cb_ctx, sa,
                                        P2P_PROV_DISC_INFO_UNAVAILABLE,
                                        adv_id, adv_mac, NULL);
-       } else if (msg.wps_config_methods != dev->req_config_methods ||
-                  status != P2P_SC_SUCCESS) {
+       } else if (status != P2P_SC_SUCCESS) {
                p2p_dbg(p2p, "Peer rejected our Provision Discovery Request");
                if (p2p->cfg->prov_disc_fail)
                        p2p->cfg->prov_disc_fail(p2p->cfg->cb_ctx, sa,