diff options
| author | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
| commit | 97a2847d064e2fdd2e3cd4ff14cad2f377f0677a (patch) | |
| tree | e49ce105dc6febc25dc3ceba6070ea3998c7330c /tools/hv/hv_kvp_daemon.c | |
| parent | e99a03c6f50a699d63b5751e3e88f84e43b037a7 (diff) | |
| parent | d2d0395fd1778d4bf714adc5bfd23a5d748d7802 (diff) | |
| download | talos-op-linux-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.tar.gz talos-op-linux-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.zip | |
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing
Reiserfs locking fixes.
Diffstat (limited to 'tools/hv/hv_kvp_daemon.c')
| -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; } |
