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>

diff --git a/net/tipc/link.c b/net/tipc/link.c
index b73adeb5cdee7e4b336cc213458e9980ddd2b5da..a572f0a27e0bb9ff024c3877c15ab902fcd4ad1d 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -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);

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index b694c9acadc6c0c73de0da1a11f6b6595221c388..0562b38a6c132f2259cf738cf3791e9209c1f9b3 100644 (file)
--- 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)
                        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)) {

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 50063664b93f08ded807f8370bc727c7441c320c..7b4f4d709b1127a0f7c6eca409e1702e9ffef2b8 100644 (file)
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -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
  */