diff --git a/net/tipc/link.c b/net/tipc/link.c index 0cc64800ab9..f3a078fe70c 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -1426,8 +1426,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr, tipc_addr_string_fill(addr_string, n_ptr->addr); pr_info("Broadcast link info for %s\n", addr_string); - pr_info("Supportable: %d, Supported: %d, Acked: %u\n", - n_ptr->bclink.supportable, + pr_info("Supported: %d, Acked: %u\n", n_ptr->bclink.supported, n_ptr->bclink.acked); pr_info("Last in: %u, Oos state: %u, Last sent: %u\n", @@ -2014,7 +2013,6 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf) } else { l_ptr->max_pkt = l_ptr->max_pkt_target; } - l_ptr->owner->bclink.supportable = (max_pkt_info != 0); /* Synchronize broadcast link info, if not done previously */ if (!tipc_node_is_up(l_ptr->owner)) { diff --git a/net/tipc/node.c b/net/tipc/node.c index d21db204e25..6f3e9b35d27 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -264,11 +264,9 @@ static void node_established_contact(struct tipc_node *n_ptr) { tipc_k_signal((Handler)tipc_named_node_up, n_ptr->addr); - if (n_ptr->bclink.supportable) { - n_ptr->bclink.acked = tipc_bclink_get_last_sent(); - tipc_bclink_add_node(n_ptr->addr); - n_ptr->bclink.supported = 1; - } + n_ptr->bclink.acked = tipc_bclink_get_last_sent(); + tipc_bclink_add_node(n_ptr->addr); + n_ptr->bclink.supported = 1; } static void node_name_purge_complete(unsigned long node_addr) diff --git a/net/tipc/node.h b/net/tipc/node.h index cfcaf4d6e48..3ac905f36b0 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h @@ -67,7 +67,6 @@ * @permit_changeover: non-zero if node has redundant links to this system * @signature: node instance identifier * @bclink: broadcast-related info - * @supportable: non-zero if node supports TIPC b'cast link capability * @supported: non-zero if node supports TIPC b'cast capability * @acked: sequence # of last outbound b'cast message acknowledged by node * @last_in: sequence # of last in-sequence b'cast message received from node @@ -92,7 +91,6 @@ struct tipc_node { int permit_changeover; u32 signature; struct { - u8 supportable; u8 supported; u32 acked; u32 last_in;