Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0ca2c30 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: move code for resetting links from bearer.c to link.c 



We break out the code for resetting attached links in the
function tipc_reset_bearer(), and define a new function named
tipc_link_reset_list() to do this job.

This commit incurs no functional changes, but makes the code
of function tipc_reset_bearer() cleaner. It is also a preparation
for a more important change to the bearer code, in a subsequent
commit in this series.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03b92017

net/tipc/bearer.c

+1 −10
Original line number Diff line number Diff line
@@ -350,19 +350,10 @@ exit: 
 */

static int tipc_reset_bearer(struct tipc_bearer *b_ptr)

{

	struct tipc_link *l_ptr;

	struct tipc_link *temp_l_ptr;



	read_lock_bh(&tipc_net_lock);

	pr_info("Resetting bearer <%s>\n", b_ptr->name);

	spin_lock_bh(&b_ptr->lock);

	list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) {

		struct tipc_node *n_ptr = l_ptr->owner;



		spin_lock_bh(&n_ptr->lock);

		tipc_link_reset(l_ptr);

		spin_unlock_bh(&n_ptr->lock);

	}

	tipc_link_reset_list(b_ptr);

	spin_unlock_bh(&b_ptr->lock);

	read_unlock_bh(&tipc_net_lock);

	return 0;

net/tipc/link.c

+12 −0
Original line number Diff line number Diff line
@@ -461,6 +461,18 @@ void tipc_link_reset(struct tipc_link *l_ptr) 
	link_reset_statistics(l_ptr);

}



void tipc_link_reset_list(struct tipc_bearer *b_ptr)

{

	struct tipc_link *l_ptr;



	list_for_each_entry(l_ptr, &b_ptr->links, link_list) {

		struct tipc_node *n_ptr = l_ptr->owner;



		spin_lock_bh(&n_ptr->lock);

		tipc_link_reset(l_ptr);

		spin_unlock_bh(&n_ptr->lock);

	}

}



static void link_activate(struct tipc_link *l_ptr)

{

net/tipc/link.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ struct sk_buff *tipc_link_cmd_show_stats(const void *req_tlv_area, 
struct sk_buff *tipc_link_cmd_reset_stats(const void *req_tlv_area,

					  int req_tlv_space);

void tipc_link_reset(struct tipc_link *l_ptr);

void tipc_link_reset_list(struct tipc_bearer *b_ptr);

int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector);

void tipc_link_send_names(struct list_head *message_list, u32 dest);

int tipc_link_send_buf(struct tipc_link *l_ptr, struct sk_buff *buf);