tipc: Eliminate obsolete routine for handling routed messages

Eliminates a routine that is used in handling messages arriving from
another cluster or zone. Such messages can no longer be received by TIPC
now that multi-cluster and multi-zone network support has been eliminated.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/link.c b/net/tipc/link.c
index a572f0a27e0bb9ff024c3877c15ab902fcd4ad1d..43639ff1cbec3480734d36b43bddd0bbffdcd717 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2423,9 +2423,6 @@ static int link_send_long_buf(struct link *l_ptr, struct sk_buff *buf)
        else
                destaddr = msg_destnode(inmsg);
 
-       if (msg_routed(inmsg))
-               msg_set_prevnode(inmsg, tipc_own_addr);
-
        /* Prepare reusable fragment header: */
 
        tipc_msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT,

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 0562b38a6c132f2259cf738cf3791e9209c1f9b3..6d92d17e7fb5eb3c51b1ee85f944a02cc8669c84 100644 (file)
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -192,8 +192,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)
                default:
                        tipc_printf(buf, "UNKNOWN TYPE %u", msg_type(msg));
                }
-               if (msg_routed(msg) && !msg_non_seq(msg))
-                       tipc_printf(buf, "ROUT:");
                if (msg_reroute_cnt(msg))
                        tipc_printf(buf, "REROUTED(%u):",
                                    msg_reroute_cnt(msg));
@@ -210,8 +208,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)
                default:
                        tipc_printf(buf, "UNKNOWN:%x", msg_type(msg));
                }
-               if (msg_routed(msg))
-                       tipc_printf(buf, "ROUT:");
                if (msg_reroute_cnt(msg))
                        tipc_printf(buf, "REROUTED(%u):",
                                    msg_reroute_cnt(msg));
@@ -232,8 +228,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)
                default:
                        tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg));
                }
-               if (msg_routed(msg))
-                       tipc_printf(buf, "ROUT:");
                if (msg_reroute_cnt(msg))
                        tipc_printf(buf, "REROUTED(%u):", msg_reroute_cnt(msg));
                break;

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 7b4f4d709b1127a0f7c6eca409e1702e9ffef2b8..de02339fc175f453baf35269e074c036cc04a64e 100644 (file)
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -421,13 +421,6 @@ static inline int msg_is_dest(struct tipc_msg *m, u32 d)
        return msg_short(m) || (msg_destnode(m) == d);
 }
 
-static inline u32 msg_routed(struct tipc_msg *m)
-{
-       if (likely(msg_short(m)))
-               return 0;
-       return (msg_destnode(m) ^ msg_orignode(m)) >> 11;
-}
-
 static inline u32 msg_nametype(struct tipc_msg *m)
 {
        return msg_word(m, 8);