aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil Dutt <duttus@codeaurora.org>2012-08-21 19:33:26 +0530
committerSteve Kondik <shade@chemlab.org>2014-06-12 14:07:29 -0700
commitee538890b73cdc29e1c7564f1391c536697976f7 (patch)
treec2a64a654d3a1af82ef36a581cf0db830f7ad8aa
parent89a35a70e4333d378e35433987f79437a1861b2f (diff)
downloadandroid_external_wpa_supplicant_8-ee538890b73cdc29e1c7564f1391c536697976f7.tar.gz
android_external_wpa_supplicant_8-ee538890b73cdc29e1c7564f1391c536697976f7.tar.bz2
android_external_wpa_supplicant_8-ee538890b73cdc29e1c7564f1391c536697976f7.zip
wpa_supplicant_8: Don't expire peers when in P2P_PENDING_PD.
A p2p_expiration_timeout during Provisional Discovery (when PD request is sent before p2p_connect) shall result in the device entry getting removed.Blocking the same from getting removed . (cherry picked from commit 5a5ea05885457412de6f1dabce73d92865c5a75e) Change-Id: Ic25ea00000ce22b34cdcdb618239ff8c6097ae39
-rw-r--r--src/p2p/p2p.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index 160dfc20..e31c4e9a 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -70,6 +70,8 @@ int p2p_connection_in_progress(struct p2p_data *p2p)
wpa_printf(MSG_DEBUG, "p2p_connection_in_progress state %d", p2p->state);
ret = 0;
}
+ if (p2p->pending_action_state == P2P_PENDING_PD)
+ ret = 1;
return ret;
}