diff --git a/[refs] b/[refs] index 602c1118fbf6..52e2059ba6cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed33a9c4e354b08630bcf4cea70596f690487108 +refs/heads/master: 062b4c99fe70f95e07e8af15617750d2a6fb6789 diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c index 933764cdfe9a..4cb500b53cf1 100644 --- a/trunk/net/tipc/link.c +++ b/trunk/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;