---

yaml --- r: 290045 b: refs/heads/master c: dff10e9 h: refs/heads/master i: 290043: 6167cdf v: v3
git-mirror · Feb 6, 2012 · 7e482f3 · 7e482f3
1 parent 17f594d
commit 7e482f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3175bd9add570f3b5c06877369897b334556a2ff
+refs/heads/master: dff10e9e637663c8c5dd0bae1a8f0e899cbb4a36
diff --git a/trunk/net/tipc/port.c b/trunk/net/tipc/port.c
@@ -400,15 +400,16 @@ int tipc_reject_msg(struct sk_buff *buf, u32 err)
 
 	/* send self-abort message when rejecting on a connected port */
 	if (msg_connected(msg)) {
-		struct sk_buff *abuf = NULL;
 		struct tipc_port *p_ptr = tipc_port_lock(msg_destport(msg));
 
 		if (p_ptr) {
+			struct sk_buff *abuf = NULL;
+
 			if (p_ptr->connected)
 				abuf = port_build_self_abort_msg(p_ptr, err);
 			tipc_port_unlock(p_ptr);
+			tipc_net_route_msg(abuf);
 		}
-		tipc_net_route_msg(abuf);
 	}
 
 	/* send returned message & dispose of rejected message */