diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-02-28 11:47:36 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 16:35:19 -0400 |
commit | 50d492321a2d94aa2ff5e26e73af08d937f8acb0 (patch) | |
tree | d242923fff586437417a9e6ad64397b8de767f04 /net/tipc/bearer.c | |
parent | f9107ebe7d18a04f07d2a990a912efa2a2ac1873 (diff) |
tipc: Remove bearer flag indicating existence of broadcast address
Eliminates the flag in the TIPC bearer structure that indicates if
the bearer supports broadcasting, since the flag is always set to 1
and serves no useful purpose.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r-- | net/tipc/bearer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index c9b5268461a6..411719feb803 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -158,7 +158,6 @@ int tipc_register_media(u32 media_type, | |||
158 | m_ptr->disable_bearer = disable; | 158 | m_ptr->disable_bearer = disable; |
159 | m_ptr->addr2str = addr2str; | 159 | m_ptr->addr2str = addr2str; |
160 | memcpy(&m_ptr->bcast_addr, bcast_addr, sizeof(*bcast_addr)); | 160 | memcpy(&m_ptr->bcast_addr, bcast_addr, sizeof(*bcast_addr)); |
161 | m_ptr->bcast = 1; | ||
162 | strcpy(m_ptr->name, name); | 161 | strcpy(m_ptr->name, name); |
163 | m_ptr->priority = bearer_priority; | 162 | m_ptr->priority = bearer_priority; |
164 | m_ptr->tolerance = link_tolerance; | 163 | m_ptr->tolerance = link_tolerance; |
@@ -563,10 +562,8 @@ restart: | |||
563 | b_ptr->priority = priority; | 562 | b_ptr->priority = priority; |
564 | INIT_LIST_HEAD(&b_ptr->cong_links); | 563 | INIT_LIST_HEAD(&b_ptr->cong_links); |
565 | INIT_LIST_HEAD(&b_ptr->links); | 564 | INIT_LIST_HEAD(&b_ptr->links); |
566 | if (m_ptr->bcast) { | 565 | b_ptr->link_req = tipc_disc_init_link_req(b_ptr, &m_ptr->bcast_addr, |
567 | b_ptr->link_req = tipc_disc_init_link_req(b_ptr, &m_ptr->bcast_addr, | 566 | disc_domain); |
568 | disc_domain); | ||
569 | } | ||
570 | spin_lock_init(&b_ptr->lock); | 567 | spin_lock_init(&b_ptr->lock); |
571 | write_unlock_bh(&tipc_net_lock); | 568 | write_unlock_bh(&tipc_net_lock); |
572 | info("Enabled bearer <%s>, discovery domain %s, priority %u\n", | 569 | info("Enabled bearer <%s>, discovery domain %s, priority %u\n", |