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

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

tipc: cleanup various cosmetic whitespace issues 



Cleans up TIPC's source code to eliminate deviations from generally
accepted coding conventions relating to leading/trailing white space
and white space around commas, braces, cases, and sizeof.

These changes are purely cosmetic and do not alter the operation of TIPC
in any way.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25860c3b

include/linux/tipc.h

+9 −9
Original line number Original line Diff line number Diff line
@@ -137,7 +137,7 @@ static inline unsigned int tipc_node(__u32 addr) 
#define TIPC_SUB_SINGLE_EVT	0x10	/* expire after first event */

#define TIPC_SUB_SINGLE_EVT	0x10	/* expire after first event */

#endif

#endif





#define TIPC_WAIT_FOREVER	~0	/* timeout for permanent subscription */

#define TIPC_WAIT_FOREVER	(~0)	/* timeout for permanent subscription */





struct tipc_subscr {

struct tipc_subscr {

	struct tipc_name_seq seq;	/* name sequence of interest */

	struct tipc_name_seq seq;	/* name sequence of interest */

include/linux/tipc_config.h

+29 −30
Original line number Original line Diff line number Diff line
@@ -379,8 +379,7 @@ struct tipc_genlmsghdr { 
 * that follows.

 * that follows.

 */

 */





struct tipc_cfg_msg_hdr

struct tipc_cfg_msg_hdr {

{

	__be32 tcm_len;		/* Message length (including header) */

	__be32 tcm_len;		/* Message length (including header) */

	__be16 tcm_type;	/* Command type */

	__be16 tcm_type;	/* Command type */

	__be16 tcm_flags;	/* Additional flags */

	__be16 tcm_flags;	/* Additional flags */

net/tipc/config.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -322,8 +322,7 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area 
	} else if (!tipc_remote_management) {

	} else if (!tipc_remote_management) {

		rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NO_REMOTE);

		rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NO_REMOTE);

		goto exit;

		goto exit;

	}

	} else if (cmd >= 0x4000) {

	else if (cmd >= 0x4000) {

		u32 domain = 0;

		u32 domain = 0;





		if ((tipc_nametbl_translate(TIPC_ZM_SRV, 0, &domain) == 0) ||

		if ((tipc_nametbl_translate(TIPC_ZM_SRV, 0, &domain) == 0) ||

net/tipc/eth_media.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -155,7 +155,8 @@ static int enable_bearer(struct tipc_bearer *tb_ptr) 




	/* Find Ethernet bearer for device (or create one) */

	/* Find Ethernet bearer for device (or create one) */





	for (;(eb_ptr != stop) && eb_ptr->dev && (eb_ptr->dev != dev); eb_ptr++);

	while ((eb_ptr != stop) && eb_ptr->dev && (eb_ptr->dev != dev))

		eb_ptr++;

	if (eb_ptr == stop)

	if (eb_ptr == stop)

		return -EDQUOT;

		return -EDQUOT;

	if (!eb_ptr->dev) {

	if (!eb_ptr->dev) {

net/tipc/link.c

+14 −17
Original line number Original line Diff line number Diff line
@@ -977,8 +977,7 @@ static int link_send_buf_fast(struct link *l_ptr, struct sk_buff *buf, 
				l_ptr->next_out = buf;

				l_ptr->next_out = buf;

				return res;

				return res;

			}

			}

		}

		} else

		else

			*used_max_pkt = l_ptr->max_pkt;

			*used_max_pkt = l_ptr->max_pkt;

	}

	}

	return tipc_link_send_buf(l_ptr, buf);  /* All other cases */

	return tipc_link_send_buf(l_ptr, buf);  /* All other cases */
@@ -1229,8 +1228,7 @@ error: 
			fragm_crs = INT_H_SIZE;

			fragm_crs = INT_H_SIZE;

			fragm_rest = fragm_sz;

			fragm_rest = fragm_sz;

		}

		}

	}

	} while (rest > 0);

	while (rest > 0);





	/*

	/*

	 * Now we have a buffer chain. Select a link and check

	 * Now we have a buffer chain. Select a link and check
@@ -1847,8 +1845,7 @@ u32 tipc_link_defer_pkt(struct sk_buff **head, 
		}

		}

		prev = crs;

		prev = crs;

		crs = crs->next;

		crs = crs->next;

	}

	} while (crs);

	while (crs);





	/* Message is a duplicate of an existing message */

	/* Message is a duplicate of an existing message */