aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/link.c4
-rw-r--r--net/tipc/node.c8
-rw-r--r--net/tipc/node.h2
3 files changed, 4 insertions, 10 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 0cc64800ab93..f3a078fe70c8 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,
1426 1426
1427 tipc_addr_string_fill(addr_string, n_ptr->addr); 1427 tipc_addr_string_fill(addr_string, n_ptr->addr);
1428 pr_info("Broadcast link info for %s\n", addr_string); 1428 pr_info("Broadcast link info for %s\n", addr_string);
1429 pr_info("Supportable: %d, Supported: %d, Acked: %u\n", 1429 pr_info("Supported: %d, Acked: %u\n",
1430 n_ptr->bclink.supportable,
1431 n_ptr->bclink.supported, 1430 n_ptr->bclink.supported,
1432 n_ptr->bclink.acked); 1431 n_ptr->bclink.acked);
1433 pr_info("Last in: %u, Oos state: %u, Last sent: %u\n", 1432 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)
2014 } else { 2013 } else {
2015 l_ptr->max_pkt = l_ptr->max_pkt_target; 2014 l_ptr->max_pkt = l_ptr->max_pkt_target;
2016 } 2015 }
2017 l_ptr->owner->bclink.supportable = (max_pkt_info != 0);
2018 2016
2019 /* Synchronize broadcast link info, if not done previously */ 2017 /* Synchronize broadcast link info, if not done previously */
2020 if (!tipc_node_is_up(l_ptr->owner)) { 2018 if (!tipc_node_is_up(l_ptr->owner)) {
diff --git a/net/tipc/node.c b/net/tipc/node.c
index d21db204e25a..6f3e9b35d27f 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)
264{ 264{
265 tipc_k_signal((Handler)tipc_named_node_up, n_ptr->addr); 265 tipc_k_signal((Handler)tipc_named_node_up, n_ptr->addr);
266 266
267 if (n_ptr->bclink.supportable) { 267 n_ptr->bclink.acked = tipc_bclink_get_last_sent();
268 n_ptr->bclink.acked = tipc_bclink_get_last_sent(); 268 tipc_bclink_add_node(n_ptr->addr);
269 tipc_bclink_add_node(n_ptr->addr); 269 n_ptr->bclink.supported = 1;
270 n_ptr->bclink.supported = 1;
271 }
272} 270}
273 271
274static void node_name_purge_complete(unsigned long node_addr) 272static void node_name_purge_complete(unsigned long node_addr)
diff --git a/net/tipc/node.h b/net/tipc/node.h
index cfcaf4d6e480..3ac905f36b03 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -67,7 +67,6 @@
67 * @permit_changeover: non-zero if node has redundant links to this system 67 * @permit_changeover: non-zero if node has redundant links to this system
68 * @signature: node instance identifier 68 * @signature: node instance identifier
69 * @bclink: broadcast-related info 69 * @bclink: broadcast-related info
70 * @supportable: non-zero if node supports TIPC b'cast link capability
71 * @supported: non-zero if node supports TIPC b'cast capability 70 * @supported: non-zero if node supports TIPC b'cast capability
72 * @acked: sequence # of last outbound b'cast message acknowledged by node 71 * @acked: sequence # of last outbound b'cast message acknowledged by node
73 * @last_in: sequence # of last in-sequence b'cast message received from node 72 * @last_in: sequence # of last in-sequence b'cast message received from node
@@ -92,7 +91,6 @@ struct tipc_node {
92 int permit_changeover; 91 int permit_changeover;
93 u32 signature; 92 u32 signature;
94 struct { 93 struct {
95 u8 supportable;
96 u8 supported; 94 u8 supported;
97 u32 acked; 95 u32 acked;
98 u32 last_in; 96 u32 last_in;