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

Commit 7945c1fb authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Eliminate remaining support for routing table messages 



Gets rid of all remaining code relating to ROUTE_DISTRIBUTOR messages.
These messages were only used in multi-cluster and multi-zone networks,
which TIPC no longer supports. (For safety, TIPC now treats such messages
the same way that it handles other unrecognized messages.)

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 50d49232

net/tipc/link.c

+4 −4
Original line number Diff line number Diff line
@@ -1746,10 +1746,6 @@ deliver: 
						tipc_node_unlock(n_ptr);

						tipc_link_recv_bundle(buf);

						continue;

					case ROUTE_DISTRIBUTOR:

						tipc_node_unlock(n_ptr);

						buf_discard(buf);

						continue;

					case NAME_DISTRIBUTOR:

						tipc_node_unlock(n_ptr);

						tipc_named_recv(buf);
@@ -1776,6 +1772,10 @@ deliver: 
							goto protocol_check;

						}

						break;

					default:

						buf_discard(buf);

						buf = NULL;

						break;

					}

				}

				tipc_node_unlock(n_ptr);

net/tipc/msg.c

+0 −27
Original line number Diff line number Diff line
@@ -274,33 +274,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) 
			tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg));

		}

		break;

	case ROUTE_DISTRIBUTOR:

		tipc_printf(buf, "ROUTING_MNG:");

		switch (msg_type(msg)) {

		case EXT_ROUTING_TABLE:

			tipc_printf(buf, "EXT_TBL:");

			tipc_printf(buf, "TO:%x:", msg_remote_node(msg));

			break;

		case LOCAL_ROUTING_TABLE:

			tipc_printf(buf, "LOCAL_TBL:");

			tipc_printf(buf, "TO:%x:", msg_remote_node(msg));

			break;

		case SLAVE_ROUTING_TABLE:

			tipc_printf(buf, "DP_TBL:");

			tipc_printf(buf, "TO:%x:", msg_remote_node(msg));

			break;

		case ROUTE_ADDITION:

			tipc_printf(buf, "ADD:");

			tipc_printf(buf, "TO:%x:", msg_remote_node(msg));

			break;

		case ROUTE_REMOVAL:

			tipc_printf(buf, "REMOVE:");

			tipc_printf(buf, "TO:%x:", msg_remote_node(msg));

			break;

		default:

			tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg));

		}

		break;

	case LINK_CONFIG:

		tipc_printf(buf, "CFG:");

		switch (msg_type(msg)) {

net/tipc/msg.h

+0 −15
Original line number Diff line number Diff line
@@ -768,21 +768,6 @@ static inline void msg_set_link_tolerance(struct tipc_msg *m, u32 n) 
	msg_set_bits(m, 9, 0, 0xffff, n);

}



/*

 * Routing table message data

 */





static inline u32 msg_remote_node(struct tipc_msg *m)

{

	return msg_word(m, msg_hdr_sz(m)/4);

}



static inline void msg_set_remote_node(struct tipc_msg *m, u32 a)

{

	msg_set_word(m, msg_hdr_sz(m)/4, a);

}



/*

 * Segmentation message types

 */