summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-04-07 09:28:47 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-09-01 11:16:35 -0400
commit062b4c99fe70f95e07e8af15617750d2a6fb6789 (patch)
tree21a20850bc91d8cce0e2550f451f80607813a27e /net
parented33a9c4e354b08630bcf4cea70596f690487108 (diff)
downloadlinux-3.10-062b4c99fe70f95e07e8af15617750d2a6fb6789.tar.gz
linux-3.10-062b4c99fe70f95e07e8af15617750d2a6fb6789.tar.bz2
linux-3.10-062b4c99fe70f95e07e8af15617750d2a6fb6789.zip
tipc: Display meaningful peer interface name during link creation
Sets the peer interface portion of the name of a newly created link endpoint to "unknown". This ensures that state and statistics information can be properly displayed during the time between the link endpoint's creation and the time handshaking with its peer is completed. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/tipc/link.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 933764cdfe9..4cb500b53cf 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -332,12 +332,12 @@ struct link *tipc_link_create(struct tipc_node *n_ptr,
l_ptr->addr = peer;
if_name = strchr(b_ptr->name, ':') + 1;
- sprintf(l_ptr->name, "%u.%u.%u:%s-%u.%u.%u:",
+ sprintf(l_ptr->name, "%u.%u.%u:%s-%u.%u.%u:unknown",
tipc_zone(tipc_own_addr), tipc_cluster(tipc_own_addr),
tipc_node(tipc_own_addr),
if_name,
tipc_zone(peer), tipc_cluster(peer), tipc_node(peer));
- /* note: peer i/f is appended to link name by reset/activate */
+ /* note: peer i/f name is updated by reset/activate message */
memcpy(&l_ptr->media_addr, media_addr, sizeof(*media_addr));
l_ptr->owner = n_ptr;
l_ptr->checkpoint = 1;