diff options
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/link.c | 3 | ||||
| -rw-r--r-- | net/tipc/msg.c | 6 | ||||
| -rw-r--r-- | net/tipc/msg.h | 7 | 
3 files changed, 0 insertions, 16 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index a572f0a27e0..43639ff1cbe 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -2423,9 +2423,6 @@ static int link_send_long_buf(struct link *l_ptr, struct sk_buff *buf)  	else  		destaddr = msg_destnode(inmsg); -	if (msg_routed(inmsg)) -		msg_set_prevnode(inmsg, tipc_own_addr); -  	/* Prepare reusable fragment header: */  	tipc_msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT, diff --git a/net/tipc/msg.c b/net/tipc/msg.c index 0562b38a6c1..6d92d17e7fb 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c @@ -192,8 +192,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)  		default:  			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))  			tipc_printf(buf, "REROUTED(%u):",  				    msg_reroute_cnt(msg)); @@ -210,8 +208,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)  		default:  			tipc_printf(buf, "UNKNOWN:%x", msg_type(msg));  		} -		if (msg_routed(msg)) -			tipc_printf(buf, "ROUT:");  		if (msg_reroute_cnt(msg))  			tipc_printf(buf, "REROUTED(%u):",  				    msg_reroute_cnt(msg)); @@ -232,8 +228,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str)  		default:  			tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg));  		} -		if (msg_routed(msg)) -			tipc_printf(buf, "ROUT:");  		if (msg_reroute_cnt(msg))  			tipc_printf(buf, "REROUTED(%u):", msg_reroute_cnt(msg));  		break; diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 7b4f4d709b1..de02339fc17 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h @@ -421,13 +421,6 @@ static inline int msg_is_dest(struct tipc_msg *m, u32 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)  {  	return msg_word(m, 8);  |