summaryrefslogtreecommitdiffstats
path: root/libnetutils/dhcp_utils.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2015-03-19 00:37:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 00:37:51 +0000
commitc92420b23b3006ed2e1ece6020dc9d6daa7bf336 (patch)
treecf2f9e0a0d792f8e4dde26ac4ce20613a72dd668 /libnetutils/dhcp_utils.c
parent71a86444873968fafda87d6ad5855df42c9ea0f0 (diff)
parentd9a65a65610cb675b092cd343f04e2176a57c26f (diff)
downloadsystem_core-c92420b23b3006ed2e1ece6020dc9d6daa7bf336.tar.gz
system_core-c92420b23b3006ed2e1ece6020dc9d6daa7bf336.tar.bz2
system_core-c92420b23b3006ed2e1ece6020dc9d6daa7bf336.zip
am d9a65a65: Merge "Improving the time to wait for assigning IP address"
* commit 'd9a65a65610cb675b092cd343f04e2176a57c26f': Improving the time to wait for assigning IP address
Diffstat (limited to 'libnetutils/dhcp_utils.c')
-rw-r--r--libnetutils/dhcp_utils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c
index 0f7c384c5..70e37c676 100644
--- a/libnetutils/dhcp_utils.c
+++ b/libnetutils/dhcp_utils.c
@@ -72,14 +72,16 @@ static int wait_for_property(const char *name, const char *desired_value, int ma
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 */
}