hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tipc: remove active flag from tipc_bearer structure 

After the allocation of tipc_bearer structure instance is converted
from statical way to dynamical way, we identify whether a certain
tipc_bearer structure pointer is valid by checking whether the pointer
is NULL or not. So the active flag in tipc_bearer structure becomes
redundant.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue 2014-03-27 12:54:34 +08:00 committed by David S. Miller
parent 3874ccbba8
commit f47de12b06
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/tipc/bcast.c
View File

@ -669,7 +669,7 @@ void tipc_bcbearer_sort(void)
for (b_index = 0; b_index < MAX_BEARERS; b_index++) { for (b_index = 0; b_index < MAX_BEARERS; b_index++) {
struct tipc_bearer *b = bearer_list[b_index]; struct tipc_bearer *b = bearer_list[b_index];
if (!b || !b->active || !b->nodes.count) if (!b || !b->nodes.count)
continue; continue;
if (!bp_temp[b->priority].primary) if (!bp_temp[b->priority].primary)

9
net/tipc/bearer.c
View File

@ -179,7 +179,7 @@ struct tipc_bearer *tipc_bearer_find(const char *name)
for (i = 0; i < MAX_BEARERS; i++) { for (i = 0; i < MAX_BEARERS; i++) {
b_ptr = bearer_list[i]; b_ptr = bearer_list[i];
if (b_ptr && b_ptr->active && (!strcmp(b_ptr->name, name))) if (b_ptr && (!strcmp(b_ptr->name, name)))
return b_ptr; return b_ptr;
} }
return NULL; return NULL;
@ -204,7 +204,7 @@ struct sk_buff *tipc_bearer_get_names(void)
b = bearer_list[j]; b = bearer_list[j];
if (!b) if (!b)
continue; continue;
if (b->active && (b->media == media_info_array[i])) { if (b->media == media_info_array[i]) {
tipc_cfg_append_tlv(buf, TIPC_TLV_BEARER_NAME, tipc_cfg_append_tlv(buf, TIPC_TLV_BEARER_NAME,
b->name, b->name,
strlen(b->name) + 1); strlen(b->name) + 1);
@ -288,7 +288,7 @@ restart:
with_this_prio = 1; with_this_prio = 1;
for (i = MAX_BEARERS; i-- != 0; ) { for (i = MAX_BEARERS; i-- != 0; ) {
b_ptr = bearer_list[i]; b_ptr = bearer_list[i];
if (!b_ptr || !b_ptr->active) { if (!b_ptr) {
bearer_id = i; bearer_id = i;
continue; continue;
} }
@ -333,7 +333,6 @@ restart:
b_ptr->tolerance = m_ptr->tolerance; b_ptr->tolerance = m_ptr->tolerance;
b_ptr->window = m_ptr->window; b_ptr->window = m_ptr->window;
b_ptr->net_plane = bearer_id + 'A'; b_ptr->net_plane = bearer_id + 'A';
b_ptr->active = 1;
b_ptr->priority = priority; b_ptr->priority = priority;
res = tipc_disc_create(b_ptr, &b_ptr->bcast_addr, disc_domain); res = tipc_disc_create(b_ptr, &b_ptr->bcast_addr, disc_domain);
@ -628,7 +627,7 @@ void tipc_bearer_stop(void)
for (i = 0; i < MAX_BEARERS; i++) { for (i = 0; i < MAX_BEARERS; i++) {
b_ptr = bearer_list[i]; b_ptr = bearer_list[i];
if (b_ptr && b_ptr->active) { if (b_ptr) {
bearer_disable(b_ptr, true); bearer_disable(b_ptr, true);
bearer_list[i] = NULL; bearer_list[i] = NULL;
} }

2
net/tipc/bearer.h
View File

@ -118,7 +118,6 @@ struct tipc_media {
* @tolerance: default link tolerance for bearer * @tolerance: default link tolerance for bearer
* @identity: array index of this bearer within TIPC bearer array * @identity: array index of this bearer within TIPC bearer array
* @link_req: ptr to (optional) structure making periodic link setup requests * @link_req: ptr to (optional) structure making periodic link setup requests
* @active: non-zero if bearer structure is represents a bearer
* @net_plane: network plane ('A' through 'H') currently associated with bearer * @net_plane: network plane ('A' through 'H') currently associated with bearer
* @nodes: indicates which nodes in cluster can be reached through bearer * @nodes: indicates which nodes in cluster can be reached through bearer
* *
@ -138,7 +137,6 @@ struct tipc_bearer {
u32 tolerance; u32 tolerance;
u32 identity; u32 identity;
struct tipc_link_req *link_req; struct tipc_link_req *link_req;
int active;
char net_plane; char net_plane;
struct tipc_node_map nodes; struct tipc_node_map nodes;
}; };

4
net/tipc/link.c
View File

@ -1458,10 +1458,6 @@ void tipc_rcv(struct sk_buff *head, struct tipc_bearer *b_ptr)
head = head->next; head = head->next;
buf->next = NULL; buf->next = NULL;
/* Ensure bearer is still enabled */
if (unlikely(!b_ptr->active))
goto discard;
/* Ensure message is well-formed */ /* Ensure message is well-formed */
if (unlikely(!link_recv_buf_validate(buf))) if (unlikely(!link_recv_buf_validate(buf)))
goto discard; goto discard;