diff options
author | Colin Cross | 2013-06-10 17:06:43 -0500 |
---|---|---|
committer | Colin Cross | 2013-06-10 17:06:43 -0500 |
commit | 0a0a8768cbc9ce36d3c9a0cc712dc8c309811565 (patch) | |
tree | a176a65373e518c886c57571445740de7884eee1 /libnetutils | |
parent | 603746f0e3b645954f33be36f7602cc8205cb71c (diff) | |
parent | c0df50afdb8e738df311c44ab80507b9470070ed (diff) | |
download | platform-system-core-0a0a8768cbc9ce36d3c9a0cc712dc8c309811565.tar.gz platform-system-core-0a0a8768cbc9ce36d3c9a0cc712dc8c309811565.tar.xz platform-system-core-0a0a8768cbc9ce36d3c9a0cc712dc8c309811565.zip |
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 bd48eff34..da00f7436 100644 --- a/libnetutils/dhcp_utils.c +++ b/libnetutils/dhcp_utils.c | |||
@@ -365,9 +365,8 @@ int dhcp_do_request_renew(const char *interface, | |||
365 | return -1; | 365 | return -1; |
366 | } | 366 | } |
367 | if (strcmp(prop_value, "ok") == 0) { | 367 | if (strcmp(prop_value, "ok") == 0) { |
368 | fill_ip_info(interface, ipaddr, gateway, prefixLength, dns, | 368 | return fill_ip_info(interface, ipaddr, gateway, prefixLength, dns, |
369 | server, lease, vendorInfo, domain); | 369 | server, lease, vendorInfo, domain); |
370 | return 0; | ||
371 | } else { | 370 | } else { |
372 | snprintf(errmsg, sizeof(errmsg), "DHCP Renew result was %s", prop_value); | 371 | snprintf(errmsg, sizeof(errmsg), "DHCP Renew result was %s", prop_value); |
373 | return -1; | 372 | return -1; |