Merge branch 'master' into tk71

[mv-sheeva.git] / include / linux / tipc.h

diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index 181c8d0e6f739fbfd091876c0726206491b8b1cd..1eefa3f6d1f446a06b4362492e2cea081950cf40 100644 (file)
--- a/include/linux/tipc.h
+++ b/include/linux/tipc.h
@@ -1,6 +1,6 @@
 /*
  * include/linux/tipc.h: Include file for TIPC socket interface
- * 
+ *
  * Copyright (c) 2003-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
@@ -42,7 +42,7 @@
 /*
  * TIPC addressing primitives
  */
- 
+
 struct tipc_portid {
        __u32 ref;
        __u32 node;
@@ -89,7 +89,7 @@ static inline unsigned int tipc_node(__u32 addr)
 #define TIPC_TOP_SRV           1       /* topology service name type */
 #define TIPC_RESERVED_TYPES    64      /* lowest user-publishable name type */
 
-/* 
+/*
  * Publication scopes when binding port names and port name sequences
  */
 
@@ -112,7 +112,7 @@ static inline unsigned int tipc_node(__u32 addr)
 #define TIPC_HIGH_IMPORTANCE           2
 #define TIPC_CRITICAL_IMPORTANCE       3
 
-/* 
+/*
  * Msg rejection/connection shutdown reasons
  */
 
@@ -127,17 +127,23 @@ static inline unsigned int tipc_node(__u32 addr)
  * TIPC topology subscription service definitions
  */
 
-#define TIPC_SUB_SERVICE       0x00    /* Filter for service availability    */
-#define TIPC_SUB_PORTS         0x01    /* Filter for port availability  */
-#define TIPC_SUB_CANCEL         0x04    /* Cancel a subscription         */
+#define TIPC_SUB_PORTS         0x01    /* filter for port availability */
+#define TIPC_SUB_SERVICE       0x02    /* filter for service availability */
+#define TIPC_SUB_CANCEL                0x04    /* cancel a subscription */
+#if 0
+/* The following filter options are not currently implemented */
+#define TIPC_SUB_NO_BIND_EVTS  0x04    /* filter out "publish" events */
+#define TIPC_SUB_NO_UNBIND_EVTS        0x08    /* filter out "withdraw" events */
+#define TIPC_SUB_SINGLE_EVT    0x10    /* expire after first event */
+#endif
 
-#define TIPC_WAIT_FOREVER      ~0      /* timeout for permanent subscription */
+#define TIPC_WAIT_FOREVER      (~0)    /* timeout for permanent subscription */
 
 struct tipc_subscr {
-       struct tipc_name_seq seq;       /* NBO. Name sequence of interest */
-       __u32 timeout;                  /* NBO. Subscription duration (in ms) */
-        __u32 filter;                  /* NBO. Bitmask of filter options */
-       char usr_handle[8];             /* Opaque. Available for subscriber use */
+       struct tipc_name_seq seq;       /* name sequence of interest */
+       __u32 timeout;                  /* subscription duration (in ms) */
+       __u32 filter;                   /* bitmask of filter options */
+       char usr_handle[8];             /* available for subscriber use */
 };
 
 #define TIPC_PUBLISHED         1       /* publication event */
@@ -145,11 +151,11 @@ struct tipc_subscr {
 #define TIPC_SUBSCR_TIMEOUT    3       /* subscription timeout event */
 
 struct tipc_event {
-       __u32 event;                    /* NBO. Event type, as defined above */
-       __u32 found_lower;              /* NBO. Matching name seq instances  */
-       __u32 found_upper;              /*  "      "       "   "    "        */
-       struct tipc_portid port;        /* NBO. Associated port              */
-       struct tipc_subscr s;           /* Original, associated subscription */
+       __u32 event;                    /* event type */
+       __u32 found_lower;              /* matching name seq instances */
+       __u32 found_upper;              /*    "      "    "     "      */
+       struct tipc_portid port;        /* associated port */
+       struct tipc_subscr s;           /* associated subscription */
 };
 
 /*