diff options
| author | Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> | 2013-04-24 11:01:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-24 11:01:53 -0700 |
| commit | 7d96eda062fd58d2ab28311bd0c8ab9193da4080 (patch) | |
| tree | 630a15fd2f7115eafcbcac99dcd9b4a43908fa85 | |
| parent | 5d1c8ad11de48ba5e449e83e1e5dcd844e9c35d1 (diff) | |
| parent | 77979736ea5fe4448d77937df56d84d263436034 (diff) | |
| download | wpa_supplicant_8-7d96eda062fd58d2ab28311bd0c8ab9193da4080.tar.gz | |
am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."
* commit '77979736ea5fe4448d77937df56d84d263436034':
P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index fc311e97..4b505b51 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -5160,7 +5160,7 @@ static void wpas_p2p_set_group_idle_timeout(struct wpa_supplicant *wpa_s) "during provisioning"); return; } -#ifndef ANDROID_P2P + if (wpa_s->show_group_started) { /* * Use the normal group formation timeout between the end of @@ -5173,7 +5173,6 @@ static void wpas_p2p_set_group_idle_timeout(struct wpa_supplicant *wpa_s) "complete"); return; } -#endif wpa_printf(MSG_DEBUG, "P2P: Set P2P group idle timeout to %u seconds", timeout); |