diff options
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r-- | net/tipc/bearer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index aa62f93a9127..45d5398cd957 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -89,9 +89,6 @@ int tipc_register_media(struct tipc_media *m_ptr) | |||
89 | 89 | ||
90 | if ((strlen(m_ptr->name) + 1) > TIPC_MAX_MEDIA_NAME) | 90 | if ((strlen(m_ptr->name) + 1) > TIPC_MAX_MEDIA_NAME) |
91 | goto exit; | 91 | goto exit; |
92 | if ((m_ptr->bcast_addr.media_id != m_ptr->type_id) || | ||
93 | !m_ptr->bcast_addr.broadcast) | ||
94 | goto exit; | ||
95 | if (m_ptr->priority > TIPC_MAX_LINK_PRI) | 92 | if (m_ptr->priority > TIPC_MAX_LINK_PRI) |
96 | goto exit; | 93 | goto exit; |
97 | if ((m_ptr->tolerance < TIPC_MIN_LINK_TOL) || | 94 | if ((m_ptr->tolerance < TIPC_MIN_LINK_TOL) || |
@@ -407,7 +404,7 @@ restart: | |||
407 | INIT_LIST_HEAD(&b_ptr->links); | 404 | INIT_LIST_HEAD(&b_ptr->links); |
408 | spin_lock_init(&b_ptr->lock); | 405 | spin_lock_init(&b_ptr->lock); |
409 | 406 | ||
410 | res = tipc_disc_create(b_ptr, &m_ptr->bcast_addr, disc_domain); | 407 | res = tipc_disc_create(b_ptr, &b_ptr->bcast_addr, disc_domain); |
411 | if (res) { | 408 | if (res) { |
412 | bearer_disable(b_ptr); | 409 | bearer_disable(b_ptr); |
413 | pr_warn("Bearer <%s> rejected, discovery object creation failed\n", | 410 | pr_warn("Bearer <%s> rejected, discovery object creation failed\n", |