From 1a033ab46491e32742ca55eae6ac0ff5de89674a Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 27 Oct 2011 15:03:24 -0400
Subject: [PATCH] --- yaml --- r: 290041 b: refs/heads/master c:
 1ec2bb08407b377e5954b3f9479c2bf67fc925a9 h: refs/heads/master i:   290039:
 5d2cd8d3e7323e3ad8ef218c7981055954229323 v: v3

---
 [refs]                 | 2 +-
 trunk/net/tipc/bcast.c | 1 -
 trunk/net/tipc/node.c  | 7 +------
 trunk/net/tipc/node.h  | 2 --
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 07a672cb2290..6fa81dff1ce3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a54d4a99dcbbfdf1d4550faa19b615091137953
+refs/heads/master: 1ec2bb08407b377e5954b3f9479c2bf67fc925a9
diff --git a/trunk/net/tipc/bcast.c b/trunk/net/tipc/bcast.c
index 1f3b1607d9d4..a9b7132d34f2 100644
--- a/trunk/net/tipc/bcast.c
+++ b/trunk/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/trunk/net/tipc/node.c b/trunk/net/tipc/node.c
index 6d8bdfd95cd6..7bc45e135fb4 100644
--- a/trunk/net/tipc/node.c
+++ b/trunk/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/trunk/net/tipc/node.h b/trunk/net/tipc/node.h
index c88ce64f8a31..e1b78a2199c2 100644
--- a/trunk/net/tipc/node.h
+++ b/trunk/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);