Commit 390bce42 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker

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: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 7945c1fb
...@@ -2423,9 +2423,6 @@ static int link_send_long_buf(struct link *l_ptr, struct sk_buff *buf) ...@@ -2423,9 +2423,6 @@ static int link_send_long_buf(struct link *l_ptr, struct sk_buff *buf)
else else
destaddr = msg_destnode(inmsg); destaddr = msg_destnode(inmsg);
if (msg_routed(inmsg))
msg_set_prevnode(inmsg, tipc_own_addr);
/* Prepare reusable fragment header: */ /* Prepare reusable fragment header: */
tipc_msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT, tipc_msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT,
......
...@@ -192,8 +192,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) ...@@ -192,8 +192,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)
default: default:
tipc_printf(buf, "UNKNOWN TYPE %u", msg_type(msg)); 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)) if (msg_reroute_cnt(msg))
tipc_printf(buf, "REROUTED(%u):", tipc_printf(buf, "REROUTED(%u):",
msg_reroute_cnt(msg)); msg_reroute_cnt(msg));
...@@ -210,8 +208,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) ...@@ -210,8 +208,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)
default: default:
tipc_printf(buf, "UNKNOWN:%x", msg_type(msg)); tipc_printf(buf, "UNKNOWN:%x", msg_type(msg));
} }
if (msg_routed(msg))
tipc_printf(buf, "ROUT:");
if (msg_reroute_cnt(msg)) if (msg_reroute_cnt(msg))
tipc_printf(buf, "REROUTED(%u):", tipc_printf(buf, "REROUTED(%u):",
msg_reroute_cnt(msg)); msg_reroute_cnt(msg));
...@@ -232,8 +228,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) ...@@ -232,8 +228,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)
default: default:
tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg)); tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg));
} }
if (msg_routed(msg))
tipc_printf(buf, "ROUT:");
if (msg_reroute_cnt(msg)) if (msg_reroute_cnt(msg))
tipc_printf(buf, "REROUTED(%u):", msg_reroute_cnt(msg)); tipc_printf(buf, "REROUTED(%u):", msg_reroute_cnt(msg));
break; break;
......
...@@ -421,13 +421,6 @@ static inline int msg_is_dest(struct tipc_msg *m, u32 d) ...@@ -421,13 +421,6 @@ static inline int msg_is_dest(struct tipc_msg *m, u32 d)
return msg_short(m) || (msg_destnode(m) == 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) static inline u32 msg_nametype(struct tipc_msg *m)
{ {
return msg_word(m, 8); return msg_word(m, 8);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment