diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2011-10-27 15:03:24 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-02-06 16:59:18 -0500 |
commit | 1ec2bb08407b377e5954b3f9479c2bf67fc925a9 (patch) | |
tree | 033b2196d0ca61cad93c999e44e07330dc591d5a /net/tipc | |
parent | 7a54d4a99dcbbfdf1d4550faa19b615091137953 (diff) |
tipc: Remove obsolete broadcast tag capability
Eliminates support for the broadcast tag field, which is no longer
used by broadcast link NACK messages.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/bcast.c | 1 | ||||
-rw-r--r-- | net/tipc/node.c | 7 | ||||
-rw-r--r-- | net/tipc/node.h | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 1f3b1607d9d..a9b7132d34f 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c | |||
@@ -325,7 +325,6 @@ void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent) | |||
325 | msg_set_bcgap_to(msg, n_ptr->bclink.deferred_head | 325 | msg_set_bcgap_to(msg, n_ptr->bclink.deferred_head |
326 | ? buf_seqno(n_ptr->bclink.deferred_head) - 1 | 326 | ? buf_seqno(n_ptr->bclink.deferred_head) - 1 |
327 | : n_ptr->bclink.last_sent); | 327 | : n_ptr->bclink.last_sent); |
328 | msg_set_bcast_tag(msg, tipc_own_tag); | ||
329 | 328 | ||
330 | spin_lock_bh(&bc_lock); | 329 | spin_lock_bh(&bc_lock); |
331 | tipc_bearer_send(&bcbearer->bearer, buf, NULL); | 330 | tipc_bearer_send(&bcbearer->bearer, buf, NULL); |
diff --git a/net/tipc/node.c b/net/tipc/node.c index 6d8bdfd95cd..7bc45e135fb 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -49,9 +49,8 @@ LIST_HEAD(tipc_node_list); | |||
49 | static u32 tipc_num_nodes; | 49 | static u32 tipc_num_nodes; |
50 | 50 | ||
51 | static atomic_t tipc_num_links = ATOMIC_INIT(0); | 51 | static atomic_t tipc_num_links = ATOMIC_INIT(0); |
52 | u32 tipc_own_tag; | ||
53 | 52 | ||
54 | /** | 53 | /* |
55 | * tipc_node_find - locate specified node object, if it exists | 54 | * tipc_node_find - locate specified node object, if it exists |
56 | */ | 55 | */ |
57 | 56 | ||
@@ -309,8 +308,6 @@ static void node_established_contact(struct tipc_node *n_ptr) | |||
309 | if (n_ptr->bclink.supportable) { | 308 | if (n_ptr->bclink.supportable) { |
310 | tipc_bclink_add_node(n_ptr->addr); | 309 | tipc_bclink_add_node(n_ptr->addr); |
311 | n_ptr->bclink.supported = 1; | 310 | n_ptr->bclink.supported = 1; |
312 | if (n_ptr->addr < tipc_own_addr) | ||
313 | tipc_own_tag++; | ||
314 | } | 311 | } |
315 | } | 312 | } |
316 | 313 | ||
@@ -353,8 +350,6 @@ static void node_lost_contact(struct tipc_node *n_ptr) | |||
353 | 350 | ||
354 | tipc_bclink_remove_node(n_ptr->addr); | 351 | tipc_bclink_remove_node(n_ptr->addr); |
355 | tipc_bclink_acknowledge(n_ptr, INVALID_LINK_SEQ); | 352 | tipc_bclink_acknowledge(n_ptr, INVALID_LINK_SEQ); |
356 | if (n_ptr->addr < tipc_own_addr) | ||
357 | tipc_own_tag--; | ||
358 | 353 | ||
359 | n_ptr->bclink.supported = 0; | 354 | n_ptr->bclink.supported = 0; |
360 | } | 355 | } |
diff --git a/net/tipc/node.h b/net/tipc/node.h index c88ce64f8a3..e1b78a2199c 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h | |||
@@ -114,8 +114,6 @@ static inline unsigned int tipc_hashfn(u32 addr) | |||
114 | return addr & (NODE_HTABLE_SIZE - 1); | 114 | return addr & (NODE_HTABLE_SIZE - 1); |
115 | } | 115 | } |
116 | 116 | ||
117 | extern u32 tipc_own_tag; | ||
118 | |||
119 | struct tipc_node *tipc_node_find(u32 addr); | 117 | struct tipc_node *tipc_node_find(u32 addr); |
120 | struct tipc_node *tipc_node_create(u32 addr); | 118 | struct tipc_node *tipc_node_create(u32 addr); |
121 | void tipc_node_delete(struct tipc_node *n_ptr); | 119 | void tipc_node_delete(struct tipc_node *n_ptr); |