diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2011-04-05 09:48:52 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-09-01 11:16:35 -0400 |
commit | 5adeb17c936d2dca155e4c93e2c6ea70419a6033 (patch) | |
tree | f3c6851837c14eefe68f0d59da1b87a48e9c03d1 /net | |
parent | ab7e11d9d0293ef1802d6ae8aab39ce58472b167 (diff) |
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.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 68b3dd637291..fafef6c3c0f6 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
@@ -141,17 +141,6 @@ void tipc_net_route_msg(struct sk_buff *buf) | |||
141 | return; | 141 | return; |
142 | msg = buf_msg(buf); | 142 | msg = buf_msg(buf); |
143 | 143 | ||
144 | msg_incr_reroute_cnt(msg); | ||
145 | if (msg_reroute_cnt(msg) > 6) { | ||
146 | if (msg_errcode(msg)) { | ||
147 | buf_discard(buf); | ||
148 | } else { | ||
149 | tipc_reject_msg(buf, msg_destport(msg) ? | ||
150 | TIPC_ERR_NO_PORT : TIPC_ERR_NO_NAME); | ||
151 | } | ||
152 | return; | ||
153 | } | ||
154 | |||
155 | /* Handle message for this node */ | 144 | /* Handle message for this node */ |
156 | dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg); | 145 | dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg); |
157 | if (tipc_in_scope(dnode, tipc_own_addr)) { | 146 | if (tipc_in_scope(dnode, tipc_own_addr)) { |