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>

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 1f3b1607d9d413f99d62788f4751044dae673d93..a9b7132d34f2abd856c65e03a50d6f2a48a41a89 100644 (file)
--- 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)
                msg_set_bcgap_to(msg, n_ptr->bclink.deferred_head
                                 ? buf_seqno(n_ptr->bclink.deferred_head) - 1
                                 : n_ptr->bclink.last_sent);
-               msg_set_bcast_tag(msg, tipc_own_tag);
 
                spin_lock_bh(&bc_lock);
                tipc_bearer_send(&bcbearer->bearer, buf, NULL);

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 6d8bdfd95cd60307ac0b25729bd74af1dacceddc..7bc45e135fb4399b637db440abb84dc8fb504ce3 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -49,9 +49,8 @@ LIST_HEAD(tipc_node_list);
 static u32 tipc_num_nodes;
 
 static atomic_t tipc_num_links = ATOMIC_INIT(0);
-u32 tipc_own_tag;
 
-/**
+/*
  * tipc_node_find - locate specified node object, if it exists
  */
 
@@ -309,8 +308,6 @@ static void node_established_contact(struct tipc_node *n_ptr)
        if (n_ptr->bclink.supportable) {
                tipc_bclink_add_node(n_ptr->addr);
                n_ptr->bclink.supported = 1;
-               if (n_ptr->addr < tipc_own_addr)
-                       tipc_own_tag++;
        }
 }
 
@@ -353,8 +350,6 @@ static void node_lost_contact(struct tipc_node *n_ptr)
 
                tipc_bclink_remove_node(n_ptr->addr);
                tipc_bclink_acknowledge(n_ptr, INVALID_LINK_SEQ);
-               if (n_ptr->addr < tipc_own_addr)
-                       tipc_own_tag--;
 
                n_ptr->bclink.supported = 0;
        }

diff --git a/net/tipc/node.h b/net/tipc/node.h
index c88ce64f8a31d1b820a8a337b37318069be91933..e1b78a2199c2e14daa4f9a106513d269ef735e76 100644 (file)
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -114,8 +114,6 @@ static inline unsigned int tipc_hashfn(u32 addr)
        return addr & (NODE_HTABLE_SIZE - 1);
 }
 
-extern u32 tipc_own_tag;
-
 struct tipc_node *tipc_node_find(u32 addr);
 struct tipc_node *tipc_node_create(u32 addr);
 void tipc_node_delete(struct tipc_node *n_ptr);