aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/discover.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-04-30 15:29:02 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-04-30 15:53:56 -0400
commit617d3c7a50b3dc15f558d60013047aede79dc055 (patch)
tree03908b63390eae5046618595b29f9ff30aea667a /net/tipc/discover.c
parentaad585473fe1e4b07f2ec1e2432475937f90c385 (diff)
tipc: compress out gratuitous extra carriage returns
Some of the comment blocks are floating in limbo between two functions, or between blocks of code. Delete the extra line feeds between any comment and its associated following block of code, to be consistent with the majority of the rest of the kernel. Also delete trailing newlines at EOF and fix a couple trivial typos in existing comments. This is a 100% cosmetic change with no runtime impact. We get rid of over 500 lines of non-code, and being blank line deletes, they won't even show up as noise in git blame. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/discover.c')
-rw-r--r--net/tipc/discover.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index c630a21b2bed..ae054cfe179f 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -70,7 +70,6 @@ struct tipc_link_req {
70 * @dest_domain: network domain of node(s) which should respond to message 70 * @dest_domain: network domain of node(s) which should respond to message
71 * @b_ptr: ptr to bearer issuing message 71 * @b_ptr: ptr to bearer issuing message
72 */ 72 */
73
74static struct sk_buff *tipc_disc_init_msg(u32 type, 73static struct sk_buff *tipc_disc_init_msg(u32 type,
75 u32 dest_domain, 74 u32 dest_domain,
76 struct tipc_bearer *b_ptr) 75 struct tipc_bearer *b_ptr)
@@ -96,7 +95,6 @@ static struct sk_buff *tipc_disc_init_msg(u32 type,
96 * @node_addr: duplicated node address 95 * @node_addr: duplicated node address
97 * @media_addr: media address advertised by duplicated node 96 * @media_addr: media address advertised by duplicated node
98 */ 97 */
99
100static void disc_dupl_alert(struct tipc_bearer *b_ptr, u32 node_addr, 98static void disc_dupl_alert(struct tipc_bearer *b_ptr, u32 node_addr,
101 struct tipc_media_addr *media_addr) 99 struct tipc_media_addr *media_addr)
102{ 100{
@@ -117,7 +115,6 @@ static void disc_dupl_alert(struct tipc_bearer *b_ptr, u32 node_addr,
117 * @buf: buffer containing message 115 * @buf: buffer containing message
118 * @b_ptr: bearer that message arrived on 116 * @b_ptr: bearer that message arrived on
119 */ 117 */
120
121void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr) 118void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
122{ 119{
123 struct tipc_node *n_ptr; 120 struct tipc_node *n_ptr;
@@ -221,7 +218,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
221 * the new media address and reset the link to ensure it starts up 218 * the new media address and reset the link to ensure it starts up
222 * cleanly. 219 * cleanly.
223 */ 220 */
224
225 if (addr_mismatch) { 221 if (addr_mismatch) {
226 if (tipc_link_is_up(link)) { 222 if (tipc_link_is_up(link)) {
227 disc_dupl_alert(b_ptr, orig, &media_addr); 223 disc_dupl_alert(b_ptr, orig, &media_addr);
@@ -264,7 +260,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
264 * Reinitiates discovery process if discovery object has no associated nodes 260 * Reinitiates discovery process if discovery object has no associated nodes
265 * and is either not currently searching or is searching at a slow rate 261 * and is either not currently searching or is searching at a slow rate
266 */ 262 */
267
268static void disc_update(struct tipc_link_req *req) 263static void disc_update(struct tipc_link_req *req)
269{ 264{
270 if (!req->num_nodes) { 265 if (!req->num_nodes) {
@@ -280,7 +275,6 @@ static void disc_update(struct tipc_link_req *req)
280 * tipc_disc_add_dest - increment set of discovered nodes 275 * tipc_disc_add_dest - increment set of discovered nodes
281 * @req: ptr to link request structure 276 * @req: ptr to link request structure
282 */ 277 */
283
284void tipc_disc_add_dest(struct tipc_link_req *req) 278void tipc_disc_add_dest(struct tipc_link_req *req)
285{ 279{
286 req->num_nodes++; 280 req->num_nodes++;
@@ -290,7 +284,6 @@ void tipc_disc_add_dest(struct tipc_link_req *req)
290 * tipc_disc_remove_dest - decrement set of discovered nodes 284 * tipc_disc_remove_dest - decrement set of discovered nodes
291 * @req: ptr to link request structure 285 * @req: ptr to link request structure
292 */ 286 */
293
294void tipc_disc_remove_dest(struct tipc_link_req *req) 287void tipc_disc_remove_dest(struct tipc_link_req *req)
295{ 288{
296 req->num_nodes--; 289 req->num_nodes--;
@@ -301,7 +294,6 @@ void tipc_disc_remove_dest(struct tipc_link_req *req)
301 * disc_send_msg - send link setup request message 294 * disc_send_msg - send link setup request message
302 * @req: ptr to link request structure 295 * @req: ptr to link request structure
303 */ 296 */
304
305static void disc_send_msg(struct tipc_link_req *req) 297static void disc_send_msg(struct tipc_link_req *req)
306{ 298{
307 if (!req->bearer->blocked) 299 if (!req->bearer->blocked)
@@ -314,7 +306,6 @@ static void disc_send_msg(struct tipc_link_req *req)
314 * 306 *
315 * Called whenever a link setup request timer associated with a bearer expires. 307 * Called whenever a link setup request timer associated with a bearer expires.
316 */ 308 */
317
318static void disc_timeout(struct tipc_link_req *req) 309static void disc_timeout(struct tipc_link_req *req)
319{ 310{
320 int max_delay; 311 int max_delay;
@@ -322,7 +313,6 @@ static void disc_timeout(struct tipc_link_req *req)
322 spin_lock_bh(&req->bearer->lock); 313 spin_lock_bh(&req->bearer->lock);
323 314
324 /* Stop searching if only desired node has been found */ 315 /* Stop searching if only desired node has been found */
325
326 if (tipc_node(req->domain) && req->num_nodes) { 316 if (tipc_node(req->domain) && req->num_nodes) {
327 req->timer_intv = TIPC_LINK_REQ_INACTIVE; 317 req->timer_intv = TIPC_LINK_REQ_INACTIVE;
328 goto exit; 318 goto exit;
@@ -335,7 +325,6 @@ static void disc_timeout(struct tipc_link_req *req)
335 * hold at fast polling rate if don't have any associated nodes, 325 * hold at fast polling rate if don't have any associated nodes,
336 * otherwise hold at slow polling rate 326 * otherwise hold at slow polling rate
337 */ 327 */
338
339 disc_send_msg(req); 328 disc_send_msg(req);
340 329
341 req->timer_intv *= 2; 330 req->timer_intv *= 2;
@@ -359,7 +348,6 @@ exit:
359 * 348 *
360 * Returns 0 if successful, otherwise -errno. 349 * Returns 0 if successful, otherwise -errno.
361 */ 350 */
362
363int tipc_disc_create(struct tipc_bearer *b_ptr, 351int tipc_disc_create(struct tipc_bearer *b_ptr,
364 struct tipc_media_addr *dest, u32 dest_domain) 352 struct tipc_media_addr *dest, u32 dest_domain)
365{ 353{
@@ -391,7 +379,6 @@ int tipc_disc_create(struct tipc_bearer *b_ptr,
391 * tipc_disc_delete - destroy object sending periodic link setup requests 379 * tipc_disc_delete - destroy object sending periodic link setup requests
392 * @req: ptr to link request structure 380 * @req: ptr to link request structure
393 */ 381 */
394
395void tipc_disc_delete(struct tipc_link_req *req) 382void tipc_disc_delete(struct tipc_link_req *req)
396{ 383{
397 k_cancel_timer(&req->timer); 384 k_cancel_timer(&req->timer);
@@ -399,4 +386,3 @@ void tipc_disc_delete(struct tipc_link_req *req)
399 kfree_skb(req->buf); 386 kfree_skb(req->buf);
400 kfree(req); 387 kfree(req);
401} 388}
402