commit 7527362eb3b9124e45905201a27cb30bb53904c7
author Colin Cross <ccross@android.com> Mon Jun 10 15:16:47 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 10 15:16:47 2013 -0700
tree 0425301552d66e666fa1eae992cc7fba68d9fb2a
parent 32a9d696c4d8172789a19a4f7de43d96d0c4d3e6
parent 0a0a8768cbc9ce36d3c9a0cc712dc8c309811565

am 0a0a8768: resolved conflicts for merge of c0df50af to stage-aosp-master

* commit '0a0a8768cbc9ce36d3c9a0cc712dc8c309811565':
  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 bd48eff..da00f74 100644
--- a/libnetutils/dhcp_utils.c
+++ b/libnetutils/dhcp_utils.c
@@ -365,9 +365,8 @@
         return -1;
     }
     if (strcmp(prop_value, "ok") == 0) {
-        fill_ip_info(interface, ipaddr, gateway, prefixLength, dns,
+        return fill_ip_info(interface, ipaddr, gateway, prefixLength, dns,
                 server, lease, vendorInfo, domain);
-        return 0;
     } else {
         snprintf(errmsg, sizeof(errmsg), "DHCP Renew result was %s", prop_value);
         return -1;