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

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

tipc: Cosmetic cleanup of topology service code 



This patch contains a set of cosmetic changes to TIPC's network
topology service subsystem, including:

- updates to comments (including copyright dates)
- re-ordering structure fields to group them more logically
- removal of optional debugging code that is no longer required
- minor changes to whitespace to conform to Linux coding conventions

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

net/tipc/subscr.c

+3 −5
Original line number Diff line number Diff line 
/*

 * net/tipc/subscr.c: TIPC subscription service

 * net/tipc/subscr.c: TIPC network topology service

 *

 * Copyright (c) 2000-2006, Ericsson AB

 * Copyright (c) 2005, Wind River Systems

 * Copyright (c) 2005-2007, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -36,10 +36,10 @@ 


#include "core.h"

#include "dbg.h"

#include "subscr.h"

#include "name_table.h"

#include "port.h"

#include "ref.h"

#include "subscr.h"



/**

 * struct subscriber - TIPC network topology subscriber
@@ -149,8 +149,6 @@ void tipc_subscr_report_overlap(struct subscription *sub, 
				u32 node,

				int must)

{

	dbg("Rep overlap %u:%u,%u<->%u,%u\n", sub->seq.type, sub->seq.lower,

	    sub->seq.upper, found_lower, found_upper);

	if (!tipc_subscr_overlap(sub, found_lower, found_upper))

		return;

	if (!must && !(sub->filter & TIPC_SUB_PORTS))

net/tipc/subscr.h

+10 −10
Original line number Diff line number Diff line 
/*

 * net/tipc/subscr.h: Include file for TIPC subscription service

 * net/tipc/subscr.h: Include file for TIPC network topology service

 *

 * Copyright (c) 2003-2006, Ericsson AB

 * Copyright (c) 2005, Wind River Systems

 * Copyright (c) 2005-2007, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -49,12 +49,12 @@ typedef void (*tipc_subscr_event) (struct subscription *sub, 
 * @timeout: duration of subscription (in ms)

 * @filter: event filtering to be done for subscription

 * @event_cb: routine invoked when a subscription event is detected

 * @timer: timer governing subscription duration (optional)

 * @nameseq_list: adjacent subscriptions in name sequence's subscription list

 * @subscription_list: adjacent subscriptions in subscriber's subscription list

 * @server_ref: object reference of server port associated with subscription

 * @swap: indicates if subscriber uses opposite endianness in its messages

 * @evt: template for events generated by subscription

 * @subscription_list: adjacent subscriptions in subscriber's subscription list

 * @nameseq_list: adjacent subscriptions in name sequence's subscription list

 * @timer_ref: reference to timer governing subscription duration (may be NULL)

 */



struct subscription {
@@ -62,12 +62,12 @@ struct subscription { 
	u32 timeout;

	u32 filter;

	tipc_subscr_event event_cb;

	struct timer_list timer;

	struct list_head nameseq_list;

	struct list_head subscription_list;

	u32 server_ref;

	int swap;

	struct tipc_event evt;

	struct list_head subscription_list;

	struct list_head nameseq_list;

	struct timer_list timer;

};



int tipc_subscr_overlap(struct subscription *sub,