diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 13:59:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-01 16:57:56 -0500 |
commit | 0e65967e33be61e5f67727edd4ea829b47676fc0 (patch) | |
tree | 1135d631e0cb88af3f8b060b8c32a130315542d8 /net/tipc/port.c | |
parent | 25860c3bd5bd1db236d4fd5826d76127d677dc28 (diff) |
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: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/port.c')
-rw-r--r-- | net/tipc/port.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c index db14b7e0afdc..78fcb75bb082 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c | |||
@@ -54,8 +54,8 @@ static DEFINE_SPINLOCK(queue_lock); | |||
54 | 54 | ||
55 | static LIST_HEAD(ports); | 55 | static LIST_HEAD(ports); |
56 | static void port_handle_node_down(unsigned long ref); | 56 | static void port_handle_node_down(unsigned long ref); |
57 | static struct sk_buff* port_build_self_abort_msg(struct port *,u32 err); | 57 | static struct sk_buff *port_build_self_abort_msg(struct port *, u32 err); |
58 | static struct sk_buff* port_build_peer_abort_msg(struct port *,u32 err); | 58 | static struct sk_buff *port_build_peer_abort_msg(struct port *, u32 err); |
59 | static void port_timeout(unsigned long ref); | 59 | static void port_timeout(unsigned long ref); |
60 | 60 | ||
61 | 61 | ||
@@ -155,7 +155,7 @@ int tipc_multicast(u32 ref, struct tipc_name_seq const *seq, | |||
155 | 155 | ||
156 | void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp) | 156 | void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp) |
157 | { | 157 | { |
158 | struct tipc_msg* msg; | 158 | struct tipc_msg *msg; |
159 | struct port_list dports = {0, NULL, }; | 159 | struct port_list dports = {0, NULL, }; |
160 | struct port_list *item = dp; | 160 | struct port_list *item = dp; |
161 | int cnt = 0; | 161 | int cnt = 0; |
@@ -193,7 +193,7 @@ void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp) | |||
193 | if ((index == 0) && (cnt != 0)) { | 193 | if ((index == 0) && (cnt != 0)) { |
194 | item = item->next; | 194 | item = item->next; |
195 | } | 195 | } |
196 | msg_set_destport(buf_msg(b),item->ports[index]); | 196 | msg_set_destport(buf_msg(b), item->ports[index]); |
197 | tipc_port_recv_msg(b); | 197 | tipc_port_recv_msg(b); |
198 | } | 198 | } |
199 | } | 199 | } |
@@ -484,7 +484,7 @@ static void port_timeout(unsigned long ref) | |||
484 | static void port_handle_node_down(unsigned long ref) | 484 | static void port_handle_node_down(unsigned long ref) |
485 | { | 485 | { |
486 | struct port *p_ptr = tipc_port_lock(ref); | 486 | struct port *p_ptr = tipc_port_lock(ref); |
487 | struct sk_buff* buf = NULL; | 487 | struct sk_buff *buf = NULL; |
488 | 488 | ||
489 | if (!p_ptr) | 489 | if (!p_ptr) |
490 | return; | 490 | return; |
@@ -620,8 +620,7 @@ static void port_print(struct port *p_ptr, struct print_buf *buf, int full_id) | |||
620 | tipc_printf(buf, " via {%u,%u}", | 620 | tipc_printf(buf, " via {%u,%u}", |
621 | p_ptr->publ.conn_type, | 621 | p_ptr->publ.conn_type, |
622 | p_ptr->publ.conn_instance); | 622 | p_ptr->publ.conn_instance); |
623 | } | 623 | } else if (p_ptr->publ.published) { |
624 | else if (p_ptr->publ.published) { | ||
625 | tipc_printf(buf, " bound to"); | 624 | tipc_printf(buf, " bound to"); |
626 | list_for_each_entry(publ, &p_ptr->publications, pport_list) { | 625 | list_for_each_entry(publ, &p_ptr->publications, pport_list) { |
627 | if (publ->lower == publ->upper) | 626 | if (publ->lower == publ->upper) |
@@ -1099,7 +1098,7 @@ int tipc_connect2port(u32 ref, struct tipc_portid const *peer) | |||
1099 | p_ptr->publ.connected = 1; | 1098 | p_ptr->publ.connected = 1; |
1100 | k_start_timer(&p_ptr->timer, p_ptr->probing_interval); | 1099 | k_start_timer(&p_ptr->timer, p_ptr->probing_interval); |
1101 | 1100 | ||
1102 | tipc_nodesub_subscribe(&p_ptr->subscription,peer->node, | 1101 | tipc_nodesub_subscribe(&p_ptr->subscription, peer->node, |
1103 | (void *)(unsigned long)ref, | 1102 | (void *)(unsigned long)ref, |
1104 | (net_ev_handler)port_handle_node_down); | 1103 | (net_ev_handler)port_handle_node_down); |
1105 | res = 0; | 1104 | res = 0; |