aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r--net/tipc/bearer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index f2839b0f6b65..9815797631e7 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -474,7 +474,7 @@ int tipc_bearer_congested(struct tipc_bearer *b_ptr, struct link *l_ptr)
474 * tipc_enable_bearer - enable bearer with the given name 474 * tipc_enable_bearer - enable bearer with the given name
475 */ 475 */
476 476
477int tipc_enable_bearer(const char *name, u32 bcast_scope, u32 priority) 477int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)
478{ 478{
479 struct tipc_bearer *b_ptr; 479 struct tipc_bearer *b_ptr;
480 struct media *m_ptr; 480 struct media *m_ptr;
@@ -494,9 +494,9 @@ int tipc_enable_bearer(const char *name, u32 bcast_scope, u32 priority)
494 warn("Bearer <%s> rejected, illegal name\n", name); 494 warn("Bearer <%s> rejected, illegal name\n", name);
495 return -EINVAL; 495 return -EINVAL;
496 } 496 }
497 if (!tipc_addr_domain_valid(bcast_scope) || 497 if (!tipc_addr_domain_valid(disc_domain) ||
498 !tipc_in_scope(bcast_scope, tipc_own_addr)) { 498 !tipc_in_scope(disc_domain, tipc_own_addr)) {
499 warn("Bearer <%s> rejected, illegal broadcast scope\n", name); 499 warn("Bearer <%s> rejected, illegal discovery domain\n", name);
500 return -EINVAL; 500 return -EINVAL;
501 } 501 }
502 if ((priority < TIPC_MIN_LINK_PRI || 502 if ((priority < TIPC_MIN_LINK_PRI ||
@@ -560,18 +560,18 @@ 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 = bcast_scope; 563 b_ptr->detect_scope = disc_domain;
564 b_ptr->priority = priority; 564 b_ptr->priority = priority;
565 INIT_LIST_HEAD(&b_ptr->cong_links); 565 INIT_LIST_HEAD(&b_ptr->cong_links);
566 INIT_LIST_HEAD(&b_ptr->links); 566 INIT_LIST_HEAD(&b_ptr->links);
567 if (m_ptr->bcast) { 567 if (m_ptr->bcast) {
568 b_ptr->link_req = tipc_disc_init_link_req(b_ptr, &m_ptr->bcast_addr, 568 b_ptr->link_req = tipc_disc_init_link_req(b_ptr, &m_ptr->bcast_addr,
569 bcast_scope); 569 disc_domain);
570 } 570 }
571 spin_lock_init(&b_ptr->lock); 571 spin_lock_init(&b_ptr->lock);
572 write_unlock_bh(&tipc_net_lock); 572 write_unlock_bh(&tipc_net_lock);
573 info("Enabled bearer <%s>, discovery domain %s, priority %u\n", 573 info("Enabled bearer <%s>, discovery domain %s, priority %u\n",
574 name, tipc_addr_string_fill(addr_string, bcast_scope), priority); 574 name, tipc_addr_string_fill(addr_string, disc_domain), priority);
575 return 0; 575 return 0;
576failed: 576failed:
577 write_unlock_bh(&tipc_net_lock); 577 write_unlock_bh(&tipc_net_lock);