7 files changed, 42 insertions, 74 deletions

diff --git a/net/tipc/core.c b/net/tipc/core.c
index d2d7d32c02c7..740aac5cdfb6 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -48,16 +48,8 @@
 #include "subscr.h"
 #include "config.h"
 
-int  tipc_eth_media_start(void);
-void tipc_eth_media_stop(void);
-int  tipc_handler_start(void);
-void tipc_handler_stop(void);
-int  tipc_socket_init(void);
-void tipc_socket_stop(void);
-int  tipc_netlink_start(void);
-void tipc_netlink_stop(void);
 
-#define TIPC_MOD_VER "1.6.2"
+#define TIPC_MOD_VER "1.6.3"
 
 #ifndef CONFIG_TIPC_ZONES
 #define CONFIG_TIPC_ZONES 3
@@ -277,7 +269,6 @@ EXPORT_SYMBOL(tipc_register_media);
 /* TIPC API for external APIs (see tipc_port.h) */
 
 EXPORT_SYMBOL(tipc_createport_raw);
-EXPORT_SYMBOL(tipc_set_msg_option);
 EXPORT_SYMBOL(tipc_reject_msg);
 EXPORT_SYMBOL(tipc_send_buf_fast);
 EXPORT_SYMBOL(tipc_acknowledge);
diff --git a/net/tipc/core.h b/net/tipc/core.h
index feabca580820..3fe9b70331d9 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -180,6 +180,12 @@ extern int  tipc_core_start(void);
 extern void tipc_core_stop(void);
 extern int  tipc_core_start_net(void);
 extern void tipc_core_stop_net(void);
+extern int  tipc_handler_start(void);
+extern void tipc_handler_stop(void);
+extern int  tipc_netlink_start(void);
+extern void tipc_netlink_stop(void);
+extern int  tipc_socket_init(void);
+extern void tipc_socket_stop(void);
 
 static inline int delimit(int val, int min, int max)
 {
diff --git a/net/tipc/link.c b/net/tipc/link.c
index cefa99824c58..a42f43430101 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2832,15 +2832,15 @@ static void link_set_supervision_props(struct link *l_ptr, u32 tolerance)
 void tipc_link_set_queue_limits(struct link *l_ptr, u32 window)
 {
         /* Data messages from this node, inclusive FIRST_FRAGM */
-        l_ptr->queue_limit[DATA_LOW] = window;
-        l_ptr->queue_limit[DATA_MEDIUM] = (window / 3) * 4;
-        l_ptr->queue_limit[DATA_HIGH] = (window / 3) * 5;
-        l_ptr->queue_limit[DATA_CRITICAL] = (window / 3) * 6;
+        l_ptr->queue_limit[TIPC_LOW_IMPORTANCE] = window;
+        l_ptr->queue_limit[TIPC_MEDIUM_IMPORTANCE] = (window / 3) * 4;
+        l_ptr->queue_limit[TIPC_HIGH_IMPORTANCE] = (window / 3) * 5;
+        l_ptr->queue_limit[TIPC_CRITICAL_IMPORTANCE] = (window / 3) * 6;
         /* Transiting data messages,inclusive FIRST_FRAGM */
-        l_ptr->queue_limit[DATA_LOW + 4] = 300;
-        l_ptr->queue_limit[DATA_MEDIUM + 4] = 600;
-        l_ptr->queue_limit[DATA_HIGH + 4] = 900;
-        l_ptr->queue_limit[DATA_CRITICAL + 4] = 1200;
+        l_ptr->queue_limit[TIPC_LOW_IMPORTANCE + 4] = 300;
+        l_ptr->queue_limit[TIPC_MEDIUM_IMPORTANCE + 4] = 600;
+        l_ptr->queue_limit[TIPC_HIGH_IMPORTANCE + 4] = 900;
+        l_ptr->queue_limit[TIPC_CRITICAL_IMPORTANCE + 4] = 1200;
         l_ptr->queue_limit[CONN_MANAGER] = 1200;
         l_ptr->queue_limit[ROUTE_DISTRIBUTOR] = 1200;
         l_ptr->queue_limit[CHANGEOVER_PROTOCOL] = 2500;
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 782485468fb2..696a8633df75 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -73,10 +73,10 @@ void tipc_msg_print(struct print_buf *buf, struct tipc_msg *msg, const char *str
                 tipc_printf(buf, "NO(%u/%u):",msg_long_msgno(msg),
                             msg_fragm_no(msg));
                 break;
-        case DATA_LOW:
-        case DATA_MEDIUM:
-        case DATA_HIGH:
-        case DATA_CRITICAL:
+        case TIPC_LOW_IMPORTANCE:
+        case TIPC_MEDIUM_IMPORTANCE:
+        case TIPC_HIGH_IMPORTANCE:
+        case TIPC_CRITICAL_IMPORTANCE:
                 tipc_printf(buf, "DAT%u:", msg_user(msg));
                 if (msg_short(msg)) {
                         tipc_printf(buf, "CON:");
@@ -229,10 +229,10 @@ void tipc_msg_print(struct print_buf *buf, struct tipc_msg *msg, const char *str
         switch (usr) {
         case CONN_MANAGER:
         case NAME_DISTRIBUTOR:
-        case DATA_LOW:
-        case DATA_MEDIUM:
-        case DATA_HIGH:
-        case DATA_CRITICAL:
+        case TIPC_LOW_IMPORTANCE:
+        case TIPC_MEDIUM_IMPORTANCE:
+        case TIPC_HIGH_IMPORTANCE:
+        case TIPC_CRITICAL_IMPORTANCE:
                 if (msg_short(msg))
                         break;  /* No error */
                 switch (msg_errcode(msg)) {
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index e9ef6df26562..6ad070d87702 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -40,18 +40,16 @@
 #include "core.h"
 
 #define TIPC_VERSION              2
-#define DATA_LOW                  TIPC_LOW_IMPORTANCE
-#define DATA_MEDIUM               TIPC_MEDIUM_IMPORTANCE
-#define DATA_HIGH                 TIPC_HIGH_IMPORTANCE
-#define DATA_CRITICAL             TIPC_CRITICAL_IMPORTANCE
-#define SHORT_H_SIZE              24    /* Connected,in cluster */
+
+#define SHORT_H_SIZE              24    /* Connected, in-cluster messages */
 #define DIR_MSG_H_SIZE            32    /* Directly addressed messages */
-#define CONN_MSG_H_SIZE           36    /* Routed connected msgs*/
-#define LONG_H_SIZE               40    /* Named Messages */
+#define LONG_H_SIZE               40    /* Named messages */
 #define MCAST_H_SIZE              44    /* Multicast messages */
-#define MAX_H_SIZE                60    /* Inclusive full options */
+#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 */
+
 #define MAX_MSG_SIZE (MAX_H_SIZE + TIPC_MAX_USER_MSG_SIZE)
-#define LINK_CONFIG               13
 
 
 /*
@@ -72,8 +70,10 @@ static inline void msg_set_bits(struct tipc_msg *m, u32 w,
                                 u32 pos, u32 mask, u32 val)
 {
         val = (val & mask) << pos;
-        m->hdr[w] &= ~htonl(mask << pos);
-        m->hdr[w] |= htonl(val);
+        val = htonl(val);
+        mask = htonl(mask << pos);
+        m->hdr[w] &= ~mask;
+        m->hdr[w] |= val;
 }
 
 /*
@@ -87,7 +87,7 @@ static inline u32 msg_version(struct tipc_msg *m)
 
 static inline void msg_set_version(struct tipc_msg *m)
 {
-        msg_set_bits(m, 0, 29, 0xf, TIPC_VERSION);
+        msg_set_bits(m, 0, 29, 7, TIPC_VERSION);
 }
 
 static inline u32 msg_user(struct tipc_msg *m)
@@ -97,7 +97,7 @@ static inline u32 msg_user(struct tipc_msg *m)
 
 static inline u32 msg_isdata(struct tipc_msg *m)
 {
-        return (msg_user(m) <= DATA_CRITICAL);
+        return (msg_user(m) <= TIPC_CRITICAL_IMPORTANCE);
 }
 
 static inline void msg_set_user(struct tipc_msg *m, u32 n)
@@ -190,18 +190,6 @@ static inline void msg_set_lookup_scope(struct tipc_msg *m, u32 n)
         msg_set_bits(m, 1, 19, 0x3, n);
 }
 
-static inline void msg_set_options(struct tipc_msg *m, const char *opt, u32 sz)
-{
-        u32 hsz = msg_hdr_sz(m);
-        char *to = (char *)&m->hdr[hsz/4];
-
-        if ((hsz < DIR_MSG_H_SIZE) || ((hsz + sz) > MAX_H_SIZE))
-                return;
-        msg_set_bits(m, 1, 16, 0x7, (hsz - 28)/4);
-        msg_set_hdr_sz(m, hsz + sz);
-        memcpy(to, opt, sz);
-}
-
 static inline u32 msg_bcast_ack(struct tipc_msg *m)
 {
         return msg_bits(m, 1, 0, 0xffff);
@@ -330,17 +318,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m)
         return (struct tipc_msg *)msg_data(m);
 }
 
-static inline void msg_expand(struct tipc_msg *m, u32 destnode)
-{
-        if (!msg_short(m))
-                return;
-        msg_set_hdr_sz(m, LONG_H_SIZE);
-        msg_set_orignode(m, msg_prevnode(m));
-        msg_set_destnode(m, destnode);
-        memset(&m->hdr[8], 0, 12);
-}
-
-
 
 /*
                 TIPC internal message header format, version 2
@@ -388,7 +365,6 @@ static inline void msg_expand(struct tipc_msg *m, u32 destnode)
 #define  NAME_DISTRIBUTOR     11
 #define  MSG_FRAGMENTER       12
 #define  LINK_CONFIG          13
-#define  INT_H_SIZE           40
 #define  DSC_H_SIZE           40
 
 /*
diff --git a/net/tipc/port.c b/net/tipc/port.c
index f508614ca59b..e2646a96935d 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -242,7 +242,8 @@ u32 tipc_createport_raw(void *usr_handle,
         p_ptr->publ.max_pkt = MAX_PKT_DEFAULT;
         p_ptr->publ.ref = ref;
         msg = &p_ptr->publ.phdr;
-        msg_init(msg, DATA_LOW, TIPC_NAMED_MSG, TIPC_OK, LONG_H_SIZE, 0);
+        msg_init(msg, TIPC_LOW_IMPORTANCE, TIPC_NAMED_MSG, TIPC_OK, LONG_H_SIZE,
+                 0);
         msg_set_orignode(msg, tipc_own_addr);
         msg_set_prevnode(msg, tipc_own_addr);
         msg_set_origport(msg, ref);
@@ -413,13 +414,6 @@ static struct sk_buff *port_build_proto_msg(u32 destport, u32 destnode,
         return buf;
 }
 
-int tipc_set_msg_option(struct tipc_port *tp_ptr, const char *opt, const u32 sz)
-{
-        msg_expand(&tp_ptr->phdr, msg_destnode(&tp_ptr->phdr));
-        msg_set_options(&tp_ptr->phdr, opt, sz);
-        return TIPC_OK;
-}
-
 int tipc_reject_msg(struct sk_buff *buf, u32 err)
 {
         struct tipc_msg *msg = buf_msg(buf);
@@ -632,7 +626,7 @@ void tipc_port_recv_proto_msg(struct sk_buff *buf)
                                              msg_orignode(msg),
                                              msg_destport(msg),
                                              tipc_own_addr,
-                                             DATA_HIGH,
+                                             TIPC_HIGH_IMPORTANCE,
                                              TIPC_CONN_MSG,
                                              err,
                                              0,
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 9ae8e9f74028..3220d5cb5b5d 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1419,7 +1419,7 @@ exit:
 /**
  * shutdown - shutdown socket connection
  * @sock: socket structure
- * @how: direction to close (unused; always treated as read + write)
+ * @how: direction to close (must be SHUT_RDWR)
  *
  * Terminates connection (if necessary), then purges socket's receive queue.
  *
@@ -1432,7 +1432,8 @@ static int shutdown(struct socket *sock, int how)
         struct sk_buff *buf;
         int res;
 
-        /* Could return -EINVAL for an invalid "how", but why bother? */
+        if (how != SHUT_RDWR)
+                return -EINVAL;
 
         if (mutex_lock_interruptible(&tsock->lock))
                 return -ERESTARTSYS;