浏览代码

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>
Allan Stephens 14 年之前
父节点
当前提交
50d492321a
共有 2 个文件被更改,包括 2 次插入7 次删除
  1. 2 5
      net/tipc/bearer.c
  2. 0 2
      net/tipc/bearer.h

+ 2 - 5
net/tipc/bearer.c

@@ -158,7 +158,6 @@ int  tipc_register_media(u32 media_type,
 	m_ptr->disable_bearer = disable;
 	m_ptr->disable_bearer = disable;
 	m_ptr->addr2str = addr2str;
 	m_ptr->addr2str = addr2str;
 	memcpy(&m_ptr->bcast_addr, bcast_addr, sizeof(*bcast_addr));
 	memcpy(&m_ptr->bcast_addr, bcast_addr, sizeof(*bcast_addr));
-	m_ptr->bcast = 1;
 	strcpy(m_ptr->name, name);
 	strcpy(m_ptr->name, name);
 	m_ptr->priority = bearer_priority;
 	m_ptr->priority = bearer_priority;
 	m_ptr->tolerance = link_tolerance;
 	m_ptr->tolerance = link_tolerance;
@@ -563,10 +562,8 @@ restart:
 	b_ptr->priority = priority;
 	b_ptr->priority = priority;
 	INIT_LIST_HEAD(&b_ptr->cong_links);
 	INIT_LIST_HEAD(&b_ptr->cong_links);
 	INIT_LIST_HEAD(&b_ptr->links);
 	INIT_LIST_HEAD(&b_ptr->links);
-	if (m_ptr->bcast) {
-		b_ptr->link_req = tipc_disc_init_link_req(b_ptr, &m_ptr->bcast_addr,
-							  disc_domain);
-	}
+	b_ptr->link_req = tipc_disc_init_link_req(b_ptr, &m_ptr->bcast_addr,
+						  disc_domain);
 	spin_lock_init(&b_ptr->lock);
 	spin_lock_init(&b_ptr->lock);
 	write_unlock_bh(&tipc_net_lock);
 	write_unlock_bh(&tipc_net_lock);
 	info("Enabled bearer <%s>, discovery domain %s, priority %u\n",
 	info("Enabled bearer <%s>, discovery domain %s, priority %u\n",

+ 0 - 2
net/tipc/bearer.h

@@ -70,7 +70,6 @@ struct tipc_bearer;
  * @disable_bearer: routine which disables a bearer
  * @disable_bearer: routine which disables a bearer
  * @addr2str: routine which converts bearer's address to string form
  * @addr2str: routine which converts bearer's address to string form
  * @bcast_addr: media address used in broadcasting
  * @bcast_addr: media address used in broadcasting
- * @bcast: non-zero if media supports broadcasting [currently mandatory]
  * @priority: default link (and bearer) priority
  * @priority: default link (and bearer) priority
  * @tolerance: default time (in ms) before declaring link failure
  * @tolerance: default time (in ms) before declaring link failure
  * @window: default window (in packets) before declaring link congestion
  * @window: default window (in packets) before declaring link congestion
@@ -87,7 +86,6 @@ struct media {
 	char *(*addr2str)(struct tipc_media_addr *a,
 	char *(*addr2str)(struct tipc_media_addr *a,
 			  char *str_buf, int str_size);
 			  char *str_buf, int str_size);
 	struct tipc_media_addr bcast_addr;
 	struct tipc_media_addr bcast_addr;
-	int bcast;
 	u32 priority;
 	u32 priority;
 	u32 tolerance;
 	u32 tolerance;
 	u32 window;
 	u32 window;