diff options
| author | Colin Cross <ccross@android.com> | 2013-06-10 15:06:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-06-10 15:06:43 -0700 |
| commit | 0a0a8768cbc9ce36d3c9a0cc712dc8c309811565 (patch) | |
| tree | a176a65373e518c886c57571445740de7884eee1 /libnetutils | |
| parent | 603746f0e3b645954f33be36f7602cc8205cb71c (diff) | |
| parent | c0df50afdb8e738df311c44ab80507b9470070ed (diff) | |
| download | system_core-0a0a8768cbc9ce36d3c9a0cc712dc8c309811565.zip system_core-0a0a8768cbc9ce36d3c9a0cc712dc8c309811565.tar.gz system_core-0a0a8768cbc9ce36d3c9a0cc712dc8c309811565.tar.bz2 | |
resolved conflicts for merge of c0df50af to stage-aosp-master
Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c
Diffstat (limited to 'libnetutils')
| -rw-r--r-- | libnetutils/dhcp_utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ int dhcp_do_request_renew(const char *interface, 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; |