Revert "cpusets: randomize node rotor used in cpuset_mem_spread_node()"

[pandora-kernel.git] / include / linux / tipc.h

diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index 3d92396..181c8d0 100644 (file)
--- a/include/linux/tipc.h
+++ b/include/linux/tipc.h
@@ -107,7 +107,7 @@ static inline unsigned int tipc_node(__u32 addr)
  * Message importance levels
  */
 
-#define TIPC_LOW_IMPORTANCE            0  /* default */
+#define TIPC_LOW_IMPORTANCE            0
 #define TIPC_MEDIUM_IMPORTANCE         1
 #define TIPC_HIGH_IMPORTANCE           2
 #define TIPC_CRITICAL_IMPORTANCE       3
@@ -127,23 +127,17 @@ static inline unsigned int tipc_node(__u32 addr)
  * TIPC topology subscription service definitions
  */
 
-#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_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_WAIT_FOREVER      ~0      /* timeout for permanent subscription */
 
 struct tipc_subscr {
-       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 */
+       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 */
 };
 
 #define TIPC_PUBLISHED         1       /* publication event */
@@ -151,11 +145,11 @@ struct tipc_subscr {
 #define TIPC_SUBSCR_TIMEOUT    3       /* subscription timeout event */
 
 struct tipc_event {
-       __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 */
+       __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 */
 };
 
 /*
@@ -188,7 +182,7 @@ struct sockaddr_tipc {
                struct tipc_name_seq nameseq;
                struct {
                        struct tipc_name name;
-                       __u32 domain; /* 0: own zone */
+                       __u32 domain;
                } name;
        } addr;
 };
@@ -206,7 +200,7 @@ struct sockaddr_tipc {
  */
 
 #define TIPC_IMPORTANCE                127     /* Default: TIPC_LOW_IMPORTANCE */
-#define TIPC_SRC_DROPPABLE     128     /* Default: 0 (resend congested msg) */
+#define TIPC_SRC_DROPPABLE     128     /* Default: based on socket type */
 #define TIPC_DEST_DROPPABLE    129     /* Default: based on socket type */
 #define TIPC_CONN_TIMEOUT      130     /* Default: 8000 (ms)  */
 #define TIPC_NODE_RECVQ_DEPTH  131     /* Default: none (read only) */