Commit 390bce4237487975c2168aa5fa786f75ead66852
Committed by
Paul Gortmaker
Paul Gortmaker
1 parent
7945c1fb02
Exists in
master
and in
7 other branches
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>
Showing 3 changed files with 0 additions and 16 deletions Side-by-side Diff
net/tipc/link.c
| ... | ... | @@ -2423,9 +2423,6 @@ |
| 2423 | 2423 | else |
| 2424 | 2424 | destaddr = msg_destnode(inmsg); |
| 2425 | 2425 | |
| 2426 | - if (msg_routed(inmsg)) | |
| 2427 | - msg_set_prevnode(inmsg, tipc_own_addr); | |
| 2428 | - | |
| 2429 | 2426 | /* Prepare reusable fragment header: */ |
| 2430 | 2427 | |
| 2431 | 2428 | tipc_msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT, |
net/tipc/msg.c
| ... | ... | @@ -192,8 +192,6 @@ |
| 192 | 192 | default: |
| 193 | 193 | tipc_printf(buf, "UNKNOWN TYPE %u", msg_type(msg)); |
| 194 | 194 | } |
| 195 | - if (msg_routed(msg) && !msg_non_seq(msg)) | |
| 196 | - tipc_printf(buf, "ROUT:"); | |
| 197 | 195 | if (msg_reroute_cnt(msg)) |
| 198 | 196 | tipc_printf(buf, "REROUTED(%u):", |
| 199 | 197 | msg_reroute_cnt(msg)); |
| ... | ... | @@ -210,8 +208,6 @@ |
| 210 | 208 | default: |
| 211 | 209 | tipc_printf(buf, "UNKNOWN:%x", msg_type(msg)); |
| 212 | 210 | } |
| 213 | - if (msg_routed(msg)) | |
| 214 | - tipc_printf(buf, "ROUT:"); | |
| 215 | 211 | if (msg_reroute_cnt(msg)) |
| 216 | 212 | tipc_printf(buf, "REROUTED(%u):", |
| 217 | 213 | msg_reroute_cnt(msg)); |
| ... | ... | @@ -232,8 +228,6 @@ |
| 232 | 228 | default: |
| 233 | 229 | tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg)); |
| 234 | 230 | } |
| 235 | - if (msg_routed(msg)) | |
| 236 | - tipc_printf(buf, "ROUT:"); | |
| 237 | 231 | if (msg_reroute_cnt(msg)) |
| 238 | 232 | tipc_printf(buf, "REROUTED(%u):", msg_reroute_cnt(msg)); |
| 239 | 233 | break; |
net/tipc/msg.h
| ... | ... | @@ -421,13 +421,6 @@ |
| 421 | 421 | return msg_short(m) || (msg_destnode(m) == d); |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | -static inline u32 msg_routed(struct tipc_msg *m) | |
| 425 | -{ | |
| 426 | - if (likely(msg_short(m))) | |
| 427 | - return 0; | |
| 428 | - return (msg_destnode(m) ^ msg_orignode(m)) >> 11; | |
| 429 | -} | |
| 430 | - | |
| 431 | 424 | static inline u32 msg_nametype(struct tipc_msg *m) |
| 432 | 425 | { |
| 433 | 426 | return msg_word(m, 8); |