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

Commit 75715217 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: Optimize message initialization routine 



This patch eliminates the rarely-used "error code" argument
when initializing a TIPC message header, since the default
value of zero is the desired result in most cases; the few
exceptional cases now set the error code explicitly.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c396a7b

net/tipc/bcast.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void bclink_send_nack(struct node *n_ptr) 
	if (buf) {

		msg = buf_msg(buf);

		msg_init(msg, BCAST_PROTOCOL, STATE_MSG,

			 TIPC_OK, INT_H_SIZE, n_ptr->addr);

			 INT_H_SIZE, n_ptr->addr);

		msg_set_mc_netid(msg, tipc_net_id);

		msg_set_bcast_ack(msg, mod(n_ptr->bclink.last_in));

		msg_set_bcgap_after(msg, n_ptr->bclink.gap_after);

net/tipc/cluster.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest) 
	if (buf) {

		msg = buf_msg(buf);

		memset((char *)msg, 0, size);

		msg_init(msg, ROUTE_DISTRIBUTOR, 0, TIPC_OK, INT_H_SIZE, dest);

		msg_init(msg, ROUTE_DISTRIBUTOR, 0, INT_H_SIZE, dest);

	}

	return buf;

}

net/tipc/discover.c

+1 −2
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ static struct sk_buff *tipc_disc_init_msg(u32 type, 


	if (buf) {

		msg = buf_msg(buf);

		msg_init(msg, LINK_CONFIG, type, TIPC_OK, DSC_H_SIZE,

			 dest_domain);

		msg_init(msg, LINK_CONFIG, type, DSC_H_SIZE, dest_domain);

		msg_set_non_seq(msg);

		msg_set_req_links(msg, req_links);

		msg_set_dest_domain(msg, dest_domain);

net/tipc/link.c

+6 −6
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer, 


	l_ptr->pmsg = (struct tipc_msg *)&l_ptr->proto_msg;

	msg = l_ptr->pmsg;

	msg_init(msg, LINK_PROTOCOL, RESET_MSG, TIPC_OK, INT_H_SIZE, l_ptr->addr);

	msg_init(msg, LINK_PROTOCOL, RESET_MSG, INT_H_SIZE, l_ptr->addr);

	msg_set_size(msg, sizeof(l_ptr->proto_msg));

	msg_set_session(msg, (tipc_random & 0xffff));

	msg_set_bearer_id(msg, b_ptr->identity);
@@ -1128,7 +1128,7 @@ int tipc_link_send_buf(struct link *l_ptr, struct sk_buff *buf) 


			if (bundler) {

				msg_init(&bundler_hdr, MSG_BUNDLER, OPEN_MSG,

					 TIPC_OK, INT_H_SIZE, l_ptr->addr);

					 INT_H_SIZE, l_ptr->addr);

				skb_copy_to_linear_data(bundler, &bundler_hdr,

							INT_H_SIZE);

				skb_trim(bundler, INT_H_SIZE);
@@ -1392,7 +1392,7 @@ static int link_send_sections_long(struct port *sender, 


	msg_dbg(hdr, ">FRAGMENTING>");

	msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT,

		 TIPC_OK, INT_H_SIZE, msg_destnode(hdr));

		 INT_H_SIZE, msg_destnode(hdr));

	msg_set_link_selector(&fragm_hdr, sender->publ.ref);

	msg_set_size(&fragm_hdr, max_pkt);

	msg_set_fragm_no(&fragm_hdr, 1);
@@ -2426,7 +2426,7 @@ void tipc_link_changeover(struct link *l_ptr) 
	}



	msg_init(&tunnel_hdr, CHANGEOVER_PROTOCOL,

		 ORIGINAL_MSG, TIPC_OK, INT_H_SIZE, l_ptr->addr);

		 ORIGINAL_MSG, INT_H_SIZE, l_ptr->addr);

	msg_set_bearer_id(&tunnel_hdr, l_ptr->peer_bearer_id);

	msg_set_msgcnt(&tunnel_hdr, msgcount);

	dbg("Link changeover requires %u tunnel messages\n", msgcount);
@@ -2481,7 +2481,7 @@ void tipc_link_send_duplicate(struct link *l_ptr, struct link *tunnel) 
	struct tipc_msg tunnel_hdr;



	msg_init(&tunnel_hdr, CHANGEOVER_PROTOCOL,

		 DUPLICATE_MSG, TIPC_OK, INT_H_SIZE, l_ptr->addr);

		 DUPLICATE_MSG, INT_H_SIZE, l_ptr->addr);

	msg_set_msgcnt(&tunnel_hdr, l_ptr->out_queue_size);

	msg_set_bearer_id(&tunnel_hdr, l_ptr->peer_bearer_id);

	iter = l_ptr->first_out;
@@ -2687,7 +2687,7 @@ int tipc_link_send_long_buf(struct link *l_ptr, struct sk_buff *buf) 
	/* Prepare reusable fragment header: */



	msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT,

		 TIPC_OK, INT_H_SIZE, destaddr);

		 INT_H_SIZE, destaddr);

	msg_set_link_selector(&fragm_hdr, msg_link_selector(inmsg));

	msg_set_long_msgno(&fragm_hdr, mod(l_ptr->long_msg_seq_no++));

	msg_set_fragm_no(&fragm_hdr, fragm_no);

net/tipc/msg.h

+1 −2
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static inline u32 msg_tot_importance(struct tipc_msg *m) 




static inline void msg_init(struct tipc_msg *m, u32 user, u32 type,

			    u32 err, u32 hsize, u32 destnode)

			    u32 hsize, u32 destnode)

{

	memset(m, 0, hsize);

	msg_set_version(m);
@@ -705,7 +705,6 @@ static inline void msg_init(struct tipc_msg *m, u32 user, u32 type, 
	msg_set_size(m, hsize);

	msg_set_prevnode(m, tipc_own_addr);

	msg_set_type(m, type);

	msg_set_errcode(m, err);

	if (!msg_short(m)) {

		msg_set_orignode(m, tipc_own_addr);

		msg_set_destnode(m, destnode);