Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7527362e authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit '0a0a8768':
  fix bad return value in dhcp_do_request_*
parents 32a9d696 0a0a8768

libnetutils/dhcp_utils.c

+1 −2
Original line number Diff line number Diff line
@@ -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;