Merge branch 'omap_clock_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes

[cascardo/linux.git] / net / tipc / subscr.h

diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index c20f496..4b06ef6 100644 (file)
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h
@@ -39,20 +39,16 @@
 
 struct subscription;
 
-typedef void (*tipc_subscr_event) (struct subscription *sub,
-                                  u32 found_lower, u32 found_upper,
-                                  u32 event, u32 port_ref, u32 node);
-
 /**
  * struct subscription - TIPC network topology subscription object
  * @seq: name sequence associated with subscription
  * @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
  */
 
@@ -60,11 +56,11 @@ struct subscription {
        struct tipc_name_seq seq;
        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;
 };