adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

tipc: Cosmetic cleanup of topology service code

Browse source 
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: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Allan Stephens 2008-05-19 13:30:13 -07:00 committed by David S. Miller
parent 28353e7fad
commit 5b06c85c3b
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/tipc/subscr.c
View file

@ -1,8 +1,8 @@
/* /*
* net/tipc/subscr.c: TIPC subscription service * net/tipc/subscr.c: TIPC network topology service
* *
* Copyright (c) 2000-2006, Ericsson AB * Copyright (c) 2000-2006, Ericsson AB
* Copyright (c) 2005, Wind River Systems * Copyright (c) 2005-2007, Wind River Systems
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,10 +36,10 @@
#include "core.h" #include "core.h"
#include "dbg.h" #include "dbg.h"
#include "subscr.h"
#include "name_table.h" #include "name_table.h"
#include "port.h" #include "port.h"
#include "ref.h" #include "ref.h"
#include "subscr.h"
/** /**
* struct subscriber - TIPC network topology subscriber * struct subscriber - TIPC network topology subscriber
@ -149,8 +149,6 @@ void tipc_subscr_report_overlap(struct subscription *sub,
u32 node, u32 node,
int must) 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)) if (!tipc_subscr_overlap(sub, found_lower, found_upper))
return; return;
if (!must && !(sub->filter & TIPC_SUB_PORTS)) if (!must && !(sub->filter & TIPC_SUB_PORTS))

20
net/tipc/subscr.h
View file

@ -1,8 +1,8 @@
/* /*
* 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) 2003-2006, Ericsson AB
* Copyright (c) 2005, Wind River Systems * Copyright (c) 2005-2007, Wind River Systems
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * 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) * @timeout: duration of subscription (in ms)
* @filter: event filtering to be done for subscription * @filter: event filtering to be done for subscription
* @event_cb: routine invoked when a subscription event is detected * @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 * @server_ref: object reference of server port associated with subscription
* @swap: indicates if subscriber uses opposite endianness in its messages * @swap: indicates if subscriber uses opposite endianness in its messages
* @evt: template for events generated by subscription * @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 { struct subscription {
@ -62,19 +62,19 @@ struct subscription {
u32 timeout; u32 timeout;
u32 filter; u32 filter;
tipc_subscr_event event_cb; tipc_subscr_event event_cb;
struct timer_list timer;
struct list_head nameseq_list;
struct list_head subscription_list;
u32 server_ref; u32 server_ref;
int swap; int swap;
struct tipc_event evt; 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, int tipc_subscr_overlap(struct subscription *sub,
u32 found_lower, u32 found_lower,
u32 found_upper); u32 found_upper);
void tipc_subscr_report_overlap(struct subscription * sub, void tipc_subscr_report_overlap(struct subscription *sub,
u32 found_lower, u32 found_lower,
u32 found_upper, u32 found_upper,
u32 event, u32 event,