From: Dexuan Cui Date: Wed, 10 Dec 2014 11:33:20 +0000 (-0800) Subject: tools: hv: kvp_daemon: make IPv6-only-injection work X-Git-Tag: v5.15~16326^2~86 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=787d61822525295399f97390bca3e1bb4ce7a6b3;p=platform%2Fkernel%2Flinux-starfive.git tools: hv: kvp_daemon: make IPv6-only-injection work In the case the host only injects an IPv6 address, the dhcp_enabled flag is true (it's only for IPv4 according to Hyper-V host team), but we still need to proceed to parse the IPv6 information. Cc: K. Y. Srinivasan Signed-off-by: Dexuan Cui Reviewed-By: Vitaly Kuznetsov Signed-off-by: Greg Kroah-Hartman --- diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 6a6432a..4b3ee35 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -1308,16 +1308,17 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) if (error) goto setval_error; + /* + * The dhcp_enabled flag is only for IPv4. In the case the host only + * injects an IPv6 address, the flag is true, but we still need to + * proceed to parse and pass the IPv6 information to the + * disto-specific script hv_set_ifconfig. + */ if (new_val->dhcp_enabled) { error = kvp_write_file(file, "BOOTPROTO", "", "dhcp"); if (error) goto setval_error; - /* - * We are done!. - */ - goto setval_done; - } else { error = kvp_write_file(file, "BOOTPROTO", "", "none"); if (error) @@ -1345,7 +1346,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) if (error) goto setval_error; -setval_done: fclose(file); /*