summaryrefslogtreecommitdiffstats
path: root/libnetutils
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2015-03-19 00:26:30 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-19 00:26:30 +0000
commitd9a65a65610cb675b092cd343f04e2176a57c26f (patch)
treecf2f9e0a0d792f8e4dde26ac4ce20613a72dd668 /libnetutils
parent4e0a252372052f194764c3c0a511e17d22549e6c (diff)
parentc855bddc67f218af09c742527f423075c0017aa8 (diff)
downloadcore-d9a65a65610cb675b092cd343f04e2176a57c26f.tar.gz
core-d9a65a65610cb675b092cd343f04e2176a57c26f.tar.bz2
core-d9a65a65610cb675b092cd343f04e2176a57c26f.zip
Merge "Improving the time to wait for assigning IP address"
Diffstat (limited to 'libnetutils')
-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 */
}