Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[deliverable/linux.git] / include / linux / tipc.h

diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index 9536d8aeadf17db62c4a906face8258bc2500125..181c8d0e6f739fbfd091876c0726206491b8b1cd 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
@@ -182,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;
 };
@@ -200,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) */