diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2011-03-11 13:09:28 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 16:35:19 -0400 |
commit | 7945c1fb02ef08316df8c054ce180bf3f4e35ae4 (patch) | |
tree | 3c1be570b0d4239a7c946a558363b63cc15e0046 /net | |
parent | 50d492321a2d94aa2ff5e26e73af08d937f8acb0 (diff) |
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: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/tipc/link.c | 8 | ||||
-rw-r--r-- | net/tipc/msg.c | 27 | ||||
-rw-r--r-- | net/tipc/msg.h | 15 |
3 files changed, 4 insertions, 46 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index b73adeb5cdee..a572f0a27e0b 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -1746,10 +1746,6 @@ deliver: | |||
1746 | tipc_node_unlock(n_ptr); | 1746 | tipc_node_unlock(n_ptr); |
1747 | tipc_link_recv_bundle(buf); | 1747 | tipc_link_recv_bundle(buf); |
1748 | continue; | 1748 | continue; |
1749 | case ROUTE_DISTRIBUTOR: | ||
1750 | tipc_node_unlock(n_ptr); | ||
1751 | buf_discard(buf); | ||
1752 | continue; | ||
1753 | case NAME_DISTRIBUTOR: | 1749 | case NAME_DISTRIBUTOR: |
1754 | tipc_node_unlock(n_ptr); | 1750 | tipc_node_unlock(n_ptr); |
1755 | tipc_named_recv(buf); | 1751 | tipc_named_recv(buf); |
@@ -1776,6 +1772,10 @@ deliver: | |||
1776 | goto protocol_check; | 1772 | goto protocol_check; |
1777 | } | 1773 | } |
1778 | break; | 1774 | break; |
1775 | default: | ||
1776 | buf_discard(buf); | ||
1777 | buf = NULL; | ||
1778 | break; | ||
1779 | } | 1779 | } |
1780 | } | 1780 | } |
1781 | tipc_node_unlock(n_ptr); | 1781 | tipc_node_unlock(n_ptr); |
diff --git a/net/tipc/msg.c b/net/tipc/msg.c index b694c9acadc6..0562b38a6c13 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c | |||
@@ -274,33 +274,6 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) | |||
274 | tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg)); | 274 | tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg)); |
275 | } | 275 | } |
276 | break; | 276 | break; |
277 | case ROUTE_DISTRIBUTOR: | ||
278 | tipc_printf(buf, "ROUTING_MNG:"); | ||
279 | switch (msg_type(msg)) { | ||
280 | case EXT_ROUTING_TABLE: | ||
281 | tipc_printf(buf, "EXT_TBL:"); | ||
282 | tipc_printf(buf, "TO:%x:", msg_remote_node(msg)); | ||
283 | break; | ||
284 | case LOCAL_ROUTING_TABLE: | ||
285 | tipc_printf(buf, "LOCAL_TBL:"); | ||
286 | tipc_printf(buf, "TO:%x:", msg_remote_node(msg)); | ||
287 | break; | ||
288 | case SLAVE_ROUTING_TABLE: | ||
289 | tipc_printf(buf, "DP_TBL:"); | ||
290 | tipc_printf(buf, "TO:%x:", msg_remote_node(msg)); | ||
291 | break; | ||
292 | case ROUTE_ADDITION: | ||
293 | tipc_printf(buf, "ADD:"); | ||
294 | tipc_printf(buf, "TO:%x:", msg_remote_node(msg)); | ||
295 | break; | ||
296 | case ROUTE_REMOVAL: | ||
297 | tipc_printf(buf, "REMOVE:"); | ||
298 | tipc_printf(buf, "TO:%x:", msg_remote_node(msg)); | ||
299 | break; | ||
300 | default: | ||
301 | tipc_printf(buf, "UNKNOWN TYPE:%x", msg_type(msg)); | ||
302 | } | ||
303 | break; | ||
304 | case LINK_CONFIG: | 277 | case LINK_CONFIG: |
305 | tipc_printf(buf, "CFG:"); | 278 | tipc_printf(buf, "CFG:"); |
306 | switch (msg_type(msg)) { | 279 | switch (msg_type(msg)) { |
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 50063664b93f..7b4f4d709b11 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h | |||
@@ -769,21 +769,6 @@ static inline void msg_set_link_tolerance(struct tipc_msg *m, u32 n) | |||
769 | } | 769 | } |
770 | 770 | ||
771 | /* | 771 | /* |
772 | * Routing table message data | ||
773 | */ | ||
774 | |||
775 | |||
776 | static inline u32 msg_remote_node(struct tipc_msg *m) | ||
777 | { | ||
778 | return msg_word(m, msg_hdr_sz(m)/4); | ||
779 | } | ||
780 | |||
781 | static inline void msg_set_remote_node(struct tipc_msg *m, u32 a) | ||
782 | { | ||
783 | msg_set_word(m, msg_hdr_sz(m)/4, a); | ||
784 | } | ||
785 | |||
786 | /* | ||
787 | * Segmentation message types | 772 | * Segmentation message types |
788 | */ | 773 | */ |
789 | 774 | ||