---

yaml --- r: 266097 b: refs/heads/master c: ed33a9c h: refs/heads/master i: 266095: 1f1f617 v: v3
git-mirror · Sep 1, 2011 · 12c91ad · 12c91ad
1 parent d446ba6
commit 12c91ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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));