Disable router anycast address for /127 prefixes

[linux.git] / net / tipc / msg.h

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 11b74dc253f5bcf9a56eaabf3ad4bdedc3709d2b..d93178f2e852eb0c77344d7ba3e29aa616dcce20 100644 (file)
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -68,10 +68,10 @@
  * Message header sizes
  */
 
-#define SHORT_H_SIZE              24   /* Connected, in-cluster messages */
-#define DIR_MSG_H_SIZE            32   /* Directly addressed messages */
-#define LONG_H_SIZE               40   /* Named messages */
-#define MCAST_H_SIZE              44   /* Multicast messages */
+#define SHORT_H_SIZE              24   /* In-cluster basic payload message */
+#define BASIC_H_SIZE              32   /* Basic payload message */
+#define NAMED_H_SIZE              40   /* Named payload message */
+#define MCAST_H_SIZE              44   /* Multicast payload message */
 #define INT_H_SIZE                40   /* Internal messages */
 #define MIN_H_SIZE                24   /* Smallest legal TIPC header size */
 #define MAX_H_SIZE                60   /* Largest possible TIPC header size */
@@ -357,7 +357,7 @@ static inline void msg_set_mc_netid(struct tipc_msg *m, u32 p)
 
 static inline int msg_short(struct tipc_msg *m)
 {
-       return msg_hdr_sz(m) == 24;
+       return msg_hdr_sz(m) == SHORT_H_SIZE;
 }
 
 static inline u32 msg_orignode(struct tipc_msg *m)
@@ -615,7 +615,7 @@ static inline u32 msg_link_selector(struct tipc_msg *m)
 
 static inline void msg_set_link_selector(struct tipc_msg *m, u32 n)
 {
-       msg_set_bits(m, 4, 0, 1, (n & 1));
+       msg_set_bits(m, 4, 0, 1, n);
 }
 
 /*
@@ -639,7 +639,7 @@ static inline u32 msg_probe(struct tipc_msg *m)
 
 static inline void msg_set_probe(struct tipc_msg *m, u32 val)
 {
-       msg_set_bits(m, 5, 0, 1, (val & 1));
+       msg_set_bits(m, 5, 0, 1, val);
 }
 
 static inline char msg_net_plane(struct tipc_msg *m)