summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-10-27 15:03:24 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-02-06 16:59:18 -0500
commit1ec2bb08407b377e5954b3f9479c2bf67fc925a9 (patch)
tree033b2196d0ca61cad93c999e44e07330dc591d5a
parent7a54d4a99dcbbfdf1d4550faa19b615091137953 (diff)
downloadop-kernel-dev-1ec2bb08407b377e5954b3f9479c2bf67fc925a9.zip
op-kernel-dev-1ec2bb08407b377e5954b3f9479c2bf67fc925a9.tar.gz
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>
-rw-r--r--net/tipc/bcast.c1
-rw-r--r--net/tipc/node.c7
-rw-r--r--net/tipc/node.h2
3 files changed, 1 insertions, 9 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 1f3b160..a9b7132 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)
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 6d8bdfd..7bc45e1 100644
--- 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 c88ce64..e1b78a2 100644
--- 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);
OpenPOWER on IntegriCloud