From: Thomas Veerman <thomas@minix3.org>
Date: Thu, 2 Feb 2012 11:53:52 +0000 (+0000)
Subject: INET: fix 'improved' assert
X-Git-Tag: v3.2.0~89
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=a65ff8a1aa45aa48a26cc2431a0a38919d796e7a;p=minix.git

INET: fix 'improved' assert
---

diff --git a/servers/inet/generic/tcp_send.c b/servers/inet/generic/tcp_send.c
index ec0fcaabf..b1d608857 100644
--- a/servers/inet/generic/tcp_send.c
+++ b/servers/inet/generic/tcp_send.c
@@ -1322,11 +1322,6 @@ int error;
 	tcp_conn->tc_state= TCS_CLOSED;
 	DBLOCK(0x10, tcp_print_state(tcp_conn); printf("\n"));
 
-	if (tcp_fd) {
-		assert(!tcp_conn->tc_connInprogress ||
-					(tcp_fd->tf_flags & TFF_LISTENQ));
-	}
-
 	if (tcp_fd && (tcp_fd->tf_flags & TFF_LISTENQ))
 	{
 		for (i= 0; i<TFL_LISTEN_MAX; i++)
@@ -1372,6 +1367,7 @@ int error;
 
 		if (tcp_conn->tc_connInprogress)
 			tcp_restart_connect(tcp_conn);
+		assert(!tcp_conn->tc_connInprogress);
 		assert (!(tcp_fd->tf_flags & TFF_IOCTL_IP) ||
 			(printf("req= 0x%lx\n",
 			(unsigned long)tcp_fd->tf_ioreq), 0));