commit c0df50afdb8e738df311c44ab80507b9470070ed
author Colin Cross <ccross@android.com> Mon Jun 10 21:57:21 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 10 21:57:21 2013 +0000
tree d0cbd13532a50a4250afc92a00109bafdc30a23a
parent 59fa7e107d43a4ef521413ec0bb7b0c2a5525071
parent 897df50f4cdc55339261a9fde83d650e7d85f081

Merge "fix bad return value in dhcp_do_request_*"

libnetutils/dhcp_utils.c

diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c
index b4caaf9..b940453 100644
--- a/libnetutils/dhcp_utils.c
+++ b/libnetutils/dhcp_utils.c
@@ -367,9 +367,8 @@
         return -1;
     }
     if (strcmp(prop_value, "ok") == 0) {
-        fill_ip_info(interface, ipaddr, gateway, prefixLength,
+        return fill_ip_info(interface, ipaddr, gateway, prefixLength,
                 dns1, dns2, server, lease, vendorInfo);
-        return 0;
     } else {
         snprintf(errmsg, sizeof(errmsg), "DHCP Renew result was %s", prop_value);
         return -1;