From 12c91adbee5d4198f99990a0973cbf1808b29f0c Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Tue, 5 Apr 2011 15:15:04 -0400
Subject: [PATCH] --- yaml --- r: 266097 b: refs/heads/master c:
 ed33a9c4e354b08630bcf4cea70596f690487108 h: refs/heads/master i:   266095:
 1f1f61707a0c02ebb6ddddd2ec25998bf1e8aae0 v: v3

---
 [refs]                |  2 +-
 trunk/net/tipc/link.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 9d2f1ecbe8f4..602c1118fbf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5adeb17c936d2dca155e4c93e2c6ea70419a6033
+refs/heads/master: ed33a9c4e354b08630bcf4cea70596f690487108
diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c
index f89570c54f54..933764cdfe9a 100644
--- a/trunk/net/tipc/link.c
+++ b/trunk/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));