aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2011-02-28 15:03:22 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-03-13 16:35:18 -0400
commita2b58de2e3993a23b092ae54a35c38bf0dacb618 (patch)
tree14a9772ac92d36999dbf7c5f4814b4147dec1882 /net/tipc
parent50d3e6399a61fca53c5c440a79f71299db66b803 (diff)
tipc: Remove unused field in bearer structure
Eliminates a field in TIPC's bearer objects that is set, but never referenced. 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.c1
-rw-r--r--net/tipc/bearer.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 9815797631e7..c9b5268461a6 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -560,7 +560,6 @@ restart:
560 b_ptr->media = m_ptr; 560 b_ptr->media = m_ptr;
561 b_ptr->net_plane = bearer_id + 'A'; 561 b_ptr->net_plane = bearer_id + 'A';
562 b_ptr->active = 1; 562 b_ptr->active = 1;
563 b_ptr->detect_scope = disc_domain;
564 b_ptr->priority = priority; 563 b_ptr->priority = priority;
565 INIT_LIST_HEAD(&b_ptr->cong_links); 564 INIT_LIST_HEAD(&b_ptr->cong_links);
566 INIT_LIST_HEAD(&b_ptr->links); 565 INIT_LIST_HEAD(&b_ptr->links);
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index adebdaf0d07b..305b378d0e14 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -105,7 +105,6 @@ struct media {
105 * @name: bearer name (format = media:interface) 105 * @name: bearer name (format = media:interface)
106 * @media: ptr to media structure associated with bearer 106 * @media: ptr to media structure associated with bearer
107 * @priority: default link priority for bearer 107 * @priority: default link priority for bearer
108 * @detect_scope: network address mask used during automatic link creation
109 * @identity: array index of this bearer within TIPC bearer array 108 * @identity: array index of this bearer within TIPC bearer array
110 * @link_req: ptr to (optional) structure making periodic link setup requests 109 * @link_req: ptr to (optional) structure making periodic link setup requests
111 * @links: list of non-congested links associated with bearer 110 * @links: list of non-congested links associated with bearer
@@ -128,7 +127,6 @@ struct tipc_bearer {
128 spinlock_t lock; 127 spinlock_t lock;
129 struct media *media; 128 struct media *media;
130 u32 priority; 129 u32 priority;
131 u32 detect_scope;
132 u32 identity; 130 u32 identity;
133 struct link_req *link_req; 131 struct link_req *link_req;
134 struct list_head links; 132 struct list_head links;