From 086cf2391ef9e17294fc1828de8594990a4cb398 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Mon, 30 May 2011 15:43:02 -0400 Subject: [PATCH] --- yaml --- r: 255921 b: refs/heads/master c: f01a2b6378f757727b205419b677d45edfcc5a3b h: refs/heads/master i: 255919: e53b9281547c152bcc327c27142c40e5ab6f08d4 v: v3 --- [refs] | 2 +- trunk/net/tipc/bearer.c | 1 - trunk/net/tipc/bearer.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c65875a87efe..ae26587357a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f305bf4218c75b6fd1283105bd88736157aa5d2 +refs/heads/master: f01a2b6378f757727b205419b677d45edfcc5a3b diff --git a/trunk/net/tipc/bearer.c b/trunk/net/tipc/bearer.c index 85209eadfae6..85eba9c08ee9 100644 --- a/trunk/net/tipc/bearer.c +++ b/trunk/net/tipc/bearer.c @@ -402,7 +402,6 @@ void tipc_bearer_lock_push(struct tipc_bearer *b_ptr) void tipc_continue(struct tipc_bearer *b_ptr) { spin_lock_bh(&b_ptr->lock); - b_ptr->continue_count++; if (!list_empty(&b_ptr->cong_links)) tipc_k_signal((Handler)tipc_bearer_lock_push, (unsigned long)b_ptr); b_ptr->blocked = 0; diff --git a/trunk/net/tipc/bearer.h b/trunk/net/tipc/bearer.h index 31d6172b20fd..5ad70eff1ebf 100644 --- a/trunk/net/tipc/bearer.h +++ b/trunk/net/tipc/bearer.h @@ -107,7 +107,6 @@ struct media { * @link_req: ptr to (optional) structure making periodic link setup requests * @links: list of non-congested links associated with bearer * @cong_links: list of congested links associated with bearer - * @continue_count: # of times bearer has resumed after congestion or blocking * @active: non-zero if bearer structure is represents a bearer * @net_plane: network plane ('A' through 'H') currently associated with bearer * @nodes: indicates which nodes in cluster can be reached through bearer @@ -129,7 +128,6 @@ struct tipc_bearer { struct link_req *link_req; struct list_head links; struct list_head cong_links; - u32 continue_count; int active; char net_plane; struct tipc_node_map nodes;