---

yaml --- r: 102680 b: refs/heads/master c: 84b07c1 h: refs/heads/master v: v3
git-mirror · Jun 5, 2008 · fa5516b · fa5516b
1 parent 11d46cd
commit fa5516b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e83728c7b0ce92e57aa90eb4fc271a29d7a393d5
+refs/heads/master: 84b07c1638c36ae937d4930b467001a0d22904e5
diff --git a/trunk/net/tipc/port.c b/trunk/net/tipc/port.c
@@ -842,13 +842,10 @@ static void port_dispatcher_sigh(void *dummy)
 
 				tipc_port_unlock(p_ptr);
 				if (unlikely(!connected)) {
-					if (unlikely(published))
+					if (tipc_connect2port(dref, &orig))
 						goto reject;
-					tipc_connect2port(dref,&orig);
-				}
-				if (unlikely(msg_origport(msg) != peer_port))
-					goto reject;
-				if (unlikely(msg_orignode(msg) != peer_node))
+				} else if ((msg_origport(msg) != peer_port) ||
+					   (msg_orignode(msg) != peer_node))
 					goto reject;
 				if (unlikely(!cb))
 					goto reject;