Commit 8f19afb2 authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files

tipc: cosmetic - function names are not to be full sentences 



Function names like "tipc_node_has_redundant_links" are unweildy
and result in long lines even for simple lines.  The "has" doesn't
contribute any value add, so dropping that is a slight step in the
right direction.   This is a cosmetic change, basic result of:

for i in `grep -l tipc_node_has_ *` ; do sed -i s/tipc_node_has_/tipc_node_/ $i ; done

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent e7b3acb6

net/tipc/link.c

+3 −3
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ void tipc_link_reset(struct link *l_ptr) 
	tipc_node_link_down(l_ptr->owner, l_ptr);

	tipc_bearer_remove_dest(l_ptr->b_ptr, l_ptr->addr);



	if (was_active_link && tipc_node_has_active_links(l_ptr->owner) &&

	if (was_active_link && tipc_node_active_links(l_ptr->owner) &&

	    l_ptr->owner->permit_changeover) {

		l_ptr->reset_checkpoint = checkpoint;

		l_ptr->exp_msg_count = START_CHANGEOVER;
@@ -1954,7 +1954,7 @@ void tipc_link_send_proto_msg(struct link *l_ptr, u32 msg_typ, int probe_msg, 
		msg_set_max_pkt(msg, l_ptr->max_pkt_target);

	}



	if (tipc_node_has_redundant_links(l_ptr->owner))

	if (tipc_node_redundant_links(l_ptr->owner))

		msg_set_redundant_link(msg);

	else

		msg_clear_redundant_link(msg);
@@ -2064,7 +2064,7 @@ static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf) 
		l_ptr->peer_bearer_id = msg_bearer_id(msg);



		/* Synchronize broadcast sequence numbers */

		if (!tipc_node_has_redundant_links(l_ptr->owner))

		if (!tipc_node_redundant_links(l_ptr->owner))

			l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg));

		break;

	case STATE_MSG:

net/tipc/name_distr.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void named_cluster_distribute(struct sk_buff *buf) 
	struct tipc_node *n_ptr;



	list_for_each_entry(n_ptr, &tipc_node_list, list) {

		if (tipc_node_has_active_links(n_ptr)) {

		if (tipc_node_active_links(n_ptr)) {

			buf_copy = skb_copy(buf, GFP_ATOMIC);

			if (!buf_copy)

				break;

net/tipc/node.c

+3 −3
Original line number Diff line number Diff line
@@ -223,19 +223,19 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr) 
		node_lost_contact(n_ptr);

}



int tipc_node_has_active_links(struct tipc_node *n_ptr)

int tipc_node_active_links(struct tipc_node *n_ptr)

{

	return n_ptr->active_links[0] != NULL;

}



int tipc_node_has_redundant_links(struct tipc_node *n_ptr)

int tipc_node_redundant_links(struct tipc_node *n_ptr)

{

	return n_ptr->working_links > 1;

}



int tipc_node_is_up(struct tipc_node *n_ptr)

{

	return tipc_node_has_active_links(n_ptr);

	return tipc_node_active_links(n_ptr);

}



struct tipc_node *tipc_node_attach_link(struct link *l_ptr)

net/tipc/node.h

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ struct tipc_node *tipc_node_attach_link(struct link *l_ptr); 
void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr);

void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr);

void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr);

int tipc_node_has_active_links(struct tipc_node *n_ptr);

int tipc_node_has_redundant_links(struct tipc_node *n_ptr);

int tipc_node_active_links(struct tipc_node *n_ptr);

int tipc_node_redundant_links(struct tipc_node *n_ptr);

int tipc_node_is_up(struct tipc_node *n_ptr);

struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space);

struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space);

CRA Git | Maintained and supported by SUSTech CRA and CCSE