summaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.h
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2014-03-27 12:54:34 +0800
committerDavid S. Miller <davem@davemloft.net>2014-03-27 13:08:37 -0400
commitf47de12b06c95cfc38c1c79986210c7620f264c4 (patch)
tree93689afb676155b5f71aee2cc91423cde9e56c76 /net/tipc/bearer.h
parent3874ccbba80f3b3127e94b1e055fb3d502a44718 (diff)
downloadlinux-f47de12b06c95cfc38c1c79986210c7620f264c4.tar.bz2
tipc: remove active flag from tipc_bearer structure
After the allocation of tipc_bearer structure instance is converted from statical way to dynamical way, we identify whether a certain tipc_bearer structure pointer is valid by checking whether the pointer is NULL or not. So the active flag in tipc_bearer structure becomes redundant. Signed-off-by: Ying Xue <ying.xue@windriver.com> Reviewed-by: Erik Hugne <erik.hugne@ericsson.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bearer.h')
-rw-r--r--net/tipc/bearer.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index f4e72caccb21..3f6d7d0f059b 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -118,7 +118,6 @@ struct tipc_media {
* @tolerance: default link tolerance for bearer
* @identity: array index of this bearer within TIPC bearer array
* @link_req: ptr to (optional) structure making periodic link setup requests
- * @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
*
@@ -138,7 +137,6 @@ struct tipc_bearer {
u32 tolerance;
u32 identity;
struct tipc_link_req *link_req;
- int active;
char net_plane;
struct tipc_node_map nodes;
};