commit 00c279b649a12f4d32a3bca29326e35d076a4b3d
author Dmitry Shmidt <dimitrysh@google.com> Thu Mar 19 00:43:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 19 00:43:49 2015 +0000
tree 3fd45508a06f1fd53d6d13e5b2517cef837d33cb
parent 0ff1f8094706301a8cd223e9a1c850a80401e64e
parent 7913a3a89a315df04788230478cba76f5bd86491

am c92420b2: am d9a65a65: Merge "Improving the time to wait for assigning IP address"

* commit 'c92420b23b3006ed2e1ece6020dc9d6daa7bf336':
  Improving the time to wait for assigning IP address

libnetutils/dhcp_utils.c

diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c
index 851d565..c6b9fe4 100644
--- a/libnetutils/dhcp_utils.c
+++ b/libnetutils/dhcp_utils.c
@@ -72,14 +72,16 @@
         maxnaps = 1;
     }
 
-    while (maxnaps-- > 0) {
-        usleep(NAP_TIME * 1000);
+    while (maxnaps-- >= 0) {
         if (property_get(name, value, NULL)) {
             if (desired_value == NULL ||
                     strcmp(value, desired_value) == 0) {
                 return 0;
             }
         }
+        if (maxnaps >= 0) {
+            usleep(NAP_TIME * 1000);
+        }
     }
     return -1; /* failure */
 }