Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / net / tipc / subscr.h

diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index b9af687b6368ddaed523b4b5a76fbd5f87d0bc9d..45d89bf4d202b6217b565a5c8e7730a5f6bebcfd 100644 (file)
--- 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,