diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2008-05-19 13:30:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-19 13:30:13 -0700 |
| commit | 5b06c85c3b96fa8db632f1ee94f99a2bd0215f3a (patch) | |
| tree | 7c52f30881912ed94f15f4c367d23e44ad864776 /net/tipc/subscr.h | |
| parent | 28353e7fad1d224687220a448950dc552645a50a (diff) | |
| download | linux-5b06c85c3b96fa8db632f1ee94f99a2bd0215f3a.tar.bz2 | |
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: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/subscr.h')
| -rw-r--r-- | net/tipc/subscr.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h index b9af687b6368..45d89bf4d202 100644 --- a/net/tipc/subscr.h +++ b/net/tipc/subscr.h @@ -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) 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,19 +62,19 @@ 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, +int tipc_subscr_overlap(struct subscription *sub, u32 found_lower, u32 found_upper); -void tipc_subscr_report_overlap(struct subscription * sub, +void tipc_subscr_report_overlap(struct subscription *sub, u32 found_lower, u32 found_upper, u32 event, |