svn commit: r243638 - head/sys/kern

Andre Oppermann andre at FreeBSD.org
Tue Nov 27 22:35:49 UTC 2012


Author: andre
Date: Tue Nov 27 22:35:48 2012
New Revision: 243638
URL: http://svnweb.freebsd.org/changeset/base/243638

Log:
  Fix r243627 by testing against the head socket instead of the socket
  just created.
  
  MFC after:	1 week
  X-MFC-with:	r243627

Modified:
  head/sys/kern/uipc_socket.c

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Tue Nov 27 22:34:46 2012	(r243637)
+++ head/sys/kern/uipc_socket.c	Tue Nov 27 22:35:48 2012	(r243638)
@@ -556,7 +556,7 @@ sonewconn(struct socket *head, int conns
 	 * The accept socket may be tearing down but we just
 	 * won a race on the ACCEPT_LOCK.
 	 */
-	if (!(so->so_options & SO_ACCEPTCONN)) {
+	if (!(head->so_options & SO_ACCEPTCONN)) {
 		SOCK_LOCK(so);
 		so->so_head = NULL;
 		sofree(so);		/* NB: returns ACCEPT_UNLOCK'ed. */


More information about the svn-src-head mailing list