diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 16:43:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 16:43:16 +0200 |
| commit | 78283dd29e647775cb1e63a4d6554b3090b9a9ff (patch) | |
| tree | 46a179781ed356c0546379ecc46ca5daed7ae50a /tools | |
| parent | USB: ohci_usb warn "irq nobody cared" on shutdown (diff) | |
| parent | Linux 3.11-rc3 (diff) | |
| download | linux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.tar.xz linux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.zip | |
Merge 3.11-rc3 into usb-next
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/hv/hv_kvp_daemon.c | 5 |
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; } |