diff options
| author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-02-28 15:03:22 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 16:35:18 -0400 |
| commit | a2b58de2e3993a23b092ae54a35c38bf0dacb618 (patch) | |
| tree | 14a9772ac92d36999dbf7c5f4814b4147dec1882 /net/tipc | |
| parent | 50d3e6399a61fca53c5c440a79f71299db66b803 (diff) | |
| download | linux-stable-a2b58de2e3993a23b092ae54a35c38bf0dacb618.tar.gz linux-stable-a2b58de2e3993a23b092ae54a35c38bf0dacb618.tar.bz2 linux-stable-a2b58de2e3993a23b092ae54a35c38bf0dacb618.zip | |
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.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 9815797631e7..c9b5268461a6 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -560,7 +560,6 @@ restart: b_ptr->media = m_ptr; b_ptr->net_plane = bearer_id + 'A'; b_ptr->active = 1; - b_ptr->detect_scope = disc_domain; b_ptr->priority = priority; INIT_LIST_HEAD(&b_ptr->cong_links); 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 { * @name: bearer name (format = media:interface) * @media: ptr to media structure associated with bearer * @priority: default link priority for bearer - * @detect_scope: network address mask used during automatic link creation * @identity: array index of this bearer within TIPC bearer array * @link_req: ptr to (optional) structure making periodic link setup requests * @links: list of non-congested links associated with bearer @@ -128,7 +127,6 @@ struct tipc_bearer { spinlock_t lock; struct media *media; u32 priority; - u32 detect_scope; u32 identity; struct link_req *link_req; struct list_head links; |