summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-04-05 09:48:52 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-09-01 11:16:35 -0400
commit5adeb17c936d2dca155e4c93e2c6ea70419a6033 (patch)
treef3c6851837c14eefe68f0d59da1b87a48e9c03d1 /net
parentab7e11d9d0293ef1802d6ae8aab39ce58472b167 (diff)
downloadlinux-3.10-5adeb17c936d2dca155e4c93e2c6ea70419a6033.tar.gz
linux-3.10-5adeb17c936d2dca155e4c93e2c6ea70419a6033.tar.bz2
linux-3.10-5adeb17c936d2dca155e4c93e2c6ea70419a6033.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/tipc/net.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 68b3dd63729..fafef6c3c0f 100644
--- 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)) {