diff options
| author | James Morris <jmorris@namei.org> | 2009-03-27 23:57:13 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-27 23:57:13 -0400 |
| commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
| tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /net/tipc/node.c | |
| parent | a106cbfd1f3703402fc2d95d97e7a054102250f0 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
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 */ |