aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tools
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2013-09-05 17:12:08 -0700
committerChris Zankel <chris@zankel.net>2013-09-05 17:12:08 -0700
commit0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd (patch)
treefc0354e4da0ff5ab8b8eb65d60d9a8359d02634d /tools
parentLinux 3.11-rc2 (diff)
parentLinux 3.11 (diff)
downloadwireguard-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.tar.xz
wireguard-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.zip
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
Diffstat (limited to 'tools')
-rw-r--r--tools/hv/hv_kvp_daemon.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index ca9fa4d32e07..07819bfa7dba 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -1026,9 +1026,10 @@ kvp_get_ip_info(int family, char *if_name, int op,
if (sn_offset == 0)
strcpy(sn_str, cidr_mask);
- else
+ else {
+ strcat((char *)ip_buffer->sub_net, ";");
strcat(sn_str, cidr_mask);
- strcat((char *)ip_buffer->sub_net, ";");
+ }
sn_offset += strlen(sn_str) + 1;
}