diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2011-05-30 15:43:02 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-24 16:18:16 -0400 |
commit | f01a2b6378f757727b205419b677d45edfcc5a3b (patch) | |
tree | f445c022a6ff5cc6ea4818e8a5e40b23a0a1673a /net/tipc | |
parent | 0f305bf4218c75b6fd1283105bd88736157aa5d2 (diff) |
tipc: Eliminate unused field in bearer structure
Gets rid of counter that records the number of times a bearer has
resumed after congestion or blocking, since the value is never
referenced anywhere.
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/bearer.c | 1 | ||||
-rw-r--r-- | net/tipc/bearer.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 85209eadfae6..85eba9c08ee9 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -402,7 +402,6 @@ void tipc_bearer_lock_push(struct tipc_bearer *b_ptr) | |||
402 | void tipc_continue(struct tipc_bearer *b_ptr) | 402 | void tipc_continue(struct tipc_bearer *b_ptr) |
403 | { | 403 | { |
404 | spin_lock_bh(&b_ptr->lock); | 404 | spin_lock_bh(&b_ptr->lock); |
405 | b_ptr->continue_count++; | ||
406 | if (!list_empty(&b_ptr->cong_links)) | 405 | if (!list_empty(&b_ptr->cong_links)) |
407 | tipc_k_signal((Handler)tipc_bearer_lock_push, (unsigned long)b_ptr); | 406 | tipc_k_signal((Handler)tipc_bearer_lock_push, (unsigned long)b_ptr); |
408 | b_ptr->blocked = 0; | 407 | b_ptr->blocked = 0; |
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 31d6172b20fd..5ad70eff1ebf 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h | |||
@@ -107,7 +107,6 @@ struct media { | |||
107 | * @link_req: ptr to (optional) structure making periodic link setup requests | 107 | * @link_req: ptr to (optional) structure making periodic link setup requests |
108 | * @links: list of non-congested links associated with bearer | 108 | * @links: list of non-congested links associated with bearer |
109 | * @cong_links: list of congested links associated with bearer | 109 | * @cong_links: list of congested links associated with bearer |
110 | * @continue_count: # of times bearer has resumed after congestion or blocking | ||
111 | * @active: non-zero if bearer structure is represents a bearer | 110 | * @active: non-zero if bearer structure is represents a bearer |
112 | * @net_plane: network plane ('A' through 'H') currently associated with bearer | 111 | * @net_plane: network plane ('A' through 'H') currently associated with bearer |
113 | * @nodes: indicates which nodes in cluster can be reached through bearer | 112 | * @nodes: indicates which nodes in cluster can be reached through bearer |
@@ -129,7 +128,6 @@ struct tipc_bearer { | |||
129 | struct link_req *link_req; | 128 | struct link_req *link_req; |
130 | struct list_head links; | 129 | struct list_head links; |
131 | struct list_head cong_links; | 130 | struct list_head cong_links; |
132 | u32 continue_count; | ||
133 | int active; | 131 | int active; |
134 | char net_plane; | 132 | char net_plane; |
135 | struct tipc_node_map nodes; | 133 | struct tipc_node_map nodes; |