tipc: Eliminate obsolete filter for unexpected unicast messages

Removes a test that ensures unicast link endpoints discard an incoming
message if it will not be consumed by the node itself and cannot be
forwarded to another node, since the preceding test already ensures that
the message is destined for this node and single-cluster TIPC no longer
performs message forwarding.

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 f89570c54f54f11694f07beec229ee7074fb0750..933764cdfe9a17a9f8d514a199a0d0f1de2abd4e 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1658,19 +1658,12 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *b_ptr)
                        continue;
                }
 
+               /* Discard unicast link messages destined for another node */
+
                if (unlikely(!msg_short(msg) &&
                             (msg_destnode(msg) != tipc_own_addr)))
                        goto cont;
 
-               /* Discard non-routeable messages destined for another node */
-
-               if (unlikely(!msg_isdata(msg) &&
-                            (msg_destnode(msg) != tipc_own_addr))) {
-                       if ((msg_user(msg) != CONN_MANAGER) &&
-                           (msg_user(msg) != MSG_FRAGMENTER))
-                               goto cont;
-               }
-
                /* Locate neighboring node that sent message */
 
                n_ptr = tipc_node_find(msg_prevnode(msg));