Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/tipc/link.c

+0 −3
Original line number Diff line number Diff line
@@ -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,

net/tipc/msg.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

net/tipc/msg.h

+0 −7
Original line number Diff line number Diff line
@@ -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);