tipc: Remove obsolete manipulation of message re-route count field

Eliminates code that increments and validates the re-route count field
of payload messages, since the elimination of multi-cluster support
means that it is no longer necessary for TIPC to forward incoming messages
to another node. (The obsolete code was incorrect anyway, since it
incorrectly incremented the re-route count field of messages that
originated on the node that forwarded the message.)

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

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 68b3dd6372912ad49e2d58b1368b6502a8543a3c..fafef6c3c0f65088dde6ca402ec74e19b2f15183 100644 (file)
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -141,17 +141,6 @@ void tipc_net_route_msg(struct sk_buff *buf)
                return;
        msg = buf_msg(buf);
 
-       msg_incr_reroute_cnt(msg);
-       if (msg_reroute_cnt(msg) > 6) {
-               if (msg_errcode(msg)) {
-                       buf_discard(buf);
-               } else {
-                       tipc_reject_msg(buf, msg_destport(msg) ?
-                                       TIPC_ERR_NO_PORT : TIPC_ERR_NO_NAME);
-               }
-               return;
-       }
-
        /* Handle message for this node */
        dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg);
        if (tipc_in_scope(dnode, tipc_own_addr)) {