diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/tipc/subscr.c | 8 | ||||
-rw-r--r-- | net/tipc/subscr.h | 20 |
2 files changed, 13 insertions, 15 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index 7c62791eb0cc..0326d3060bc7 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c @@ -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) 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)) 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, |