diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 21:44:42 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-29 21:44:42 +0400 |
| commit | 293d0e3bf0818f3f7307a56d3ac31f41b5078aa1 (patch) | |
| tree | aab2e5026c66d52581c39b5c21aca6e3fd8d0357 /tools/hv/hv_kvp_daemon.c | |
| parent | a9b1ae088dcb68c1c026dfaf88e2f223eef31678 (diff) | |
| parent | 3a76b35186cb967a69c4a3935caf2fdf428e933b (diff) | |
| download | linux-293d0e3bf0818f3f7307a56d3ac31f41b5078aa1.tar.xz | |
Merge branch 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351 into next/boards
From Christian Daudt, SoC changes for Broadcom.
* 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351: (673 commits)
ARM: bcm: Make secure API call optional
ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
ARM: bcm: Rename board_bcm
mmc: sdhci-bcm-kona: make linker-section warning go away
ARM: configs: disable DEBUG_LL in bcm_defconfig
ARM: bcm281xx: Board specific reboot code
ARM bcm281xx: Turn on socket & network support.
ARM: bcm281xx: Turn on L2 cache.
+ Linux 3.11-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
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; } |