diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:34:14 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:34:14 -0400 |
commit | 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch) | |
tree | a83d5e4e86edf6cb2de22db6f2ff2274753a2bab /net/tipc/node.c | |
parent | f2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff) | |
parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) |
Merge branch 'linus' into core/printk
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 20d98c56e152..2c24e7d6d950 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -703,7 +703,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) | |||
703 | 703 | ||
704 | link_info.dest = htonl(tipc_own_addr & 0xfffff00); | 704 | link_info.dest = htonl(tipc_own_addr & 0xfffff00); |
705 | link_info.up = htonl(1); | 705 | link_info.up = htonl(1); |
706 | sprintf(link_info.str, tipc_bclink_name); | 706 | strlcpy(link_info.str, tipc_bclink_name, TIPC_MAX_LINK_NAME); |
707 | tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info)); | 707 | tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info)); |
708 | 708 | ||
709 | /* Add TLVs for any other links in scope */ | 709 | /* Add TLVs for any other links in scope */ |