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

Commit 9fbfb8b1 authored by Jon Paul Maloy's avatar Jon Paul Maloy Committed by David S. Miller
Browse files

tipc: rename temporarily named functions 



After the previous commit, we can now give the functions with temporary
names, such as tipc_link_xmit2(), tipc_msg_build2() etc., their proper
names.

There are no functional changes in this commit.

Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4116e10

net/tipc/bcast.c

+3 −3
Original line number Diff line number Diff line
@@ -389,13 +389,13 @@ static void bclink_peek_nack(struct tipc_msg *msg) 
	tipc_node_unlock(n_ptr);

}



/* tipc_bclink_xmit2 - broadcast buffer chain to all nodes in cluster

/* tipc_bclink_xmit - broadcast buffer chain to all nodes in cluster

 *                    and to identified node local sockets

 * @buf: chain of buffers containing message

 * Consumes the buffer chain, except when returning -ELINKCONG

 * Returns 0 if success, otherwise errno: -ELINKCONG,-EHOSTUNREACH,-EMSGSIZE

 */

int tipc_bclink_xmit2(struct sk_buff *buf)

int tipc_bclink_xmit(struct sk_buff *buf)

{

	int rc = 0;

	int bc = 0;

net/tipc/bcast.h

+1 −1
Original line number Diff line number Diff line
@@ -98,6 +98,6 @@ int tipc_bclink_reset_stats(void); 
int  tipc_bclink_set_queue_limits(u32 limit);

void tipc_bcbearer_sort(struct tipc_node_map *nm_ptr, u32 node, bool action);

uint  tipc_bclink_get_mtu(void);

int tipc_bclink_xmit2(struct sk_buff *buf);

int tipc_bclink_xmit(struct sk_buff *buf);



#endif

net/tipc/link.c

+9 −9
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int tipc_link_cong(struct tipc_link *link, struct sk_buff *buf) 
}



/**

 * __tipc_link_xmit2(): same as tipc_link_xmit2, but destlink is known & locked

 * __tipc_link_xmit(): same as tipc_link_xmit, but destlink is known & locked

 * @link: link to use

 * @buf: chain of buffers containing message

 * Consumes the buffer chain, except when returning -ELINKCONG
@@ -715,7 +715,7 @@ static int tipc_link_cong(struct tipc_link *link, struct sk_buff *buf) 
 * Only the socket functions tipc_send_stream() and tipc_send_packet() need

 * to act on the return value, since they may need to do more send attempts.

 */

int __tipc_link_xmit2(struct tipc_link *link, struct sk_buff *buf)

int __tipc_link_xmit(struct tipc_link *link, struct sk_buff *buf)

{

	struct tipc_msg *msg = buf_msg(buf);

	uint psz = msg_size(msg);
@@ -783,7 +783,7 @@ int __tipc_link_xmit2(struct tipc_link *link, struct sk_buff *buf) 
}



/**

 * tipc_link_xmit2() is the general link level function for message sending

 * tipc_link_xmit() is the general link level function for message sending

 * @buf: chain of buffers containing message

 * @dsz: amount of user data to be sent

 * @dnode: address of destination node
@@ -791,7 +791,7 @@ int __tipc_link_xmit2(struct tipc_link *link, struct sk_buff *buf) 
 * Consumes the buffer chain, except when returning -ELINKCONG

 * Returns 0 if success, otherwise errno: -ELINKCONG,-EHOSTUNREACH,-EMSGSIZE

 */

int tipc_link_xmit2(struct sk_buff *buf, u32 dnode, u32 selector)

int tipc_link_xmit(struct sk_buff *buf, u32 dnode, u32 selector)

{

	struct tipc_link *link = NULL;

	struct tipc_node *node;
@@ -802,7 +802,7 @@ int tipc_link_xmit2(struct sk_buff *buf, u32 dnode, u32 selector) 
		tipc_node_lock(node);

		link = node->active_links[selector & 1];

		if (link)

			rc = __tipc_link_xmit2(link, buf);

			rc = __tipc_link_xmit(link, buf);

		tipc_node_unlock(node);

	}
@@ -836,7 +836,7 @@ static void tipc_link_sync_xmit(struct tipc_link *link) 
	msg = buf_msg(buf);

	tipc_msg_init(msg, BCAST_PROTOCOL, STATE_MSG, INT_H_SIZE, link->addr);

	msg_set_last_bcast(msg, link->owner->bclink.acked);

	__tipc_link_xmit2(link, buf);

	__tipc_link_xmit(link, buf);

}



/*
@@ -1683,7 +1683,7 @@ static void tipc_link_tunnel_xmit(struct tipc_link *l_ptr, 
	}

	skb_copy_to_linear_data(buf, tunnel_hdr, INT_H_SIZE);

	skb_copy_to_linear_data_offset(buf, INT_H_SIZE, msg, length);

	__tipc_link_xmit2(tunnel, buf);

	__tipc_link_xmit(tunnel, buf);

}
@@ -1716,7 +1716,7 @@ void tipc_link_failover_send_queue(struct tipc_link *l_ptr) 
		if (buf) {

			skb_copy_to_linear_data(buf, &tunnel_hdr, INT_H_SIZE);

			msg_set_size(&tunnel_hdr, INT_H_SIZE);

			__tipc_link_xmit2(tunnel, buf);

			__tipc_link_xmit(tunnel, buf);

		} else {

			pr_warn("%sunable to send changeover msg\n",

				link_co_err);
@@ -1789,7 +1789,7 @@ void tipc_link_dup_queue_xmit(struct tipc_link *l_ptr, 
		skb_copy_to_linear_data(outbuf, &tunnel_hdr, INT_H_SIZE);

		skb_copy_to_linear_data_offset(outbuf, INT_H_SIZE, iter->data,

					       length);

		__tipc_link_xmit2(tunnel, outbuf);

		__tipc_link_xmit(tunnel, outbuf);

		if (!tipc_link_is_up(l_ptr))

			return;

		iter = iter->next;

net/tipc/link.h

+2 −2
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ struct sk_buff *tipc_link_cmd_reset_stats(const void *req_tlv_area, 
void tipc_link_reset_all(struct tipc_node *node);

void tipc_link_reset(struct tipc_link *l_ptr);

void tipc_link_reset_list(unsigned int bearer_id);

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

int __tipc_link_xmit2(struct tipc_link *link, struct sk_buff *buf);

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

int __tipc_link_xmit(struct tipc_link *link, struct sk_buff *buf);

u32 tipc_link_get_max_pkt(u32 dest, u32 selector);

void tipc_link_bundle_rcv(struct sk_buff *buf);

void tipc_link_proto_xmit(struct tipc_link *l_ptr, u32 msg_typ, int prob,

net/tipc/msg.c

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf) 




/**

 * tipc_msg_build2 - create buffer chain containing specified header and data

 * tipc_msg_build - create buffer chain containing specified header and data

 * @mhdr: Message header, to be prepended to data

 * @iov: User data

 * @offset: Posision in iov to start copying from
@@ -129,7 +129,7 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf) 
 * @chain: Buffer or chain of buffers to be returned to caller

 * Returns message data size or errno: -ENOMEM, -EFAULT

 */

int tipc_msg_build2(struct tipc_msg *mhdr, struct iovec const *iov,

int tipc_msg_build(struct tipc_msg *mhdr, struct iovec const *iov,

		   int offset, int dsz, int pktmax , struct sk_buff **chain)

{

	int mhsz = msg_hdr_sz(mhdr);