commit 0a0a8768cbc9ce36d3c9a0cc712dc8c309811565
author Colin Cross <ccross@android.com> Mon Jun 10 15:06:43 2013 -0700
committer Colin Cross <ccross@android.com> Mon Jun 10 15:06:43 2013 -0700
tree a176a65373e518c886c57571445740de7884eee1
parent 603746f0e3b645954f33be36f7602cc8205cb71c
parent c0df50afdb8e738df311c44ab80507b9470070ed

resolved conflicts for merge of c0df50af to stage-aosp-master

Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c

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;