Merge "fix bad return value in dhcp_do_request_*"