diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-09 20:26:31 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-09 20:26:31 +0400 |
| commit | c7abc19ca6d48392f91ca04ebe1e9813b3ace435 (patch) | |
| tree | c23540ea1425e9891b39cdff550e90caaba38163 /tools | |
| parent | d60990d597bfa2816dfe28a5c5c6787610b423e6 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
| download | linux-c7abc19ca6d48392f91ca04ebe1e9813b3ace435.tar.xz | |
Merge tag 'v3.11-rc4' into spi-bitbang
Linux 3.11-rc4
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; } |