diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
| commit | d3ec3a1fd08f705d1b319db4113590944bcde749 (patch) | |
| tree | 598a0da59e027b455f11beab24a96ef1e56fbbcb /tools | |
| parent | sched/x86: Optimize switch_mm() for multi-threaded workloads (diff) | |
| parent | Linux 3.11-rc5 (diff) | |
| download | wireguard-linux-d3ec3a1fd08f705d1b319db4113590944bcde749.tar.xz wireguard-linux-d3ec3a1fd08f705d1b319db4113590944bcde749.zip | |
Merge tag 'v3.11-rc5' into sched/core
Merge Linux 3.11-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; } |