From owner-svn-src-head@FreeBSD.ORG  Mon May 25 13:34:04 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50D96106564A;
	Mon, 25 May 2009 13:34:04 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EA8F8FC24;
	Mon, 25 May 2009 13:34:04 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PDY4S8025250;
	Mon, 25 May 2009 13:34:04 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PDY460025249;
	Mon, 25 May 2009 13:34:04 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200905251334.n4PDY460025249@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 25 May 2009 13:34:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192757 - head/sys/netipx
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 May 2009 13:34:04 -0000

Author: rwatson
Date: Mon May 25 13:34:03 2009
New Revision: 192757
URL: http://svn.freebsd.org/changeset/base/192757

Log:
  Add missing call to ipx_pcbdetach() during SPX socket tear-down: not
  harmful in practice if running without INVARIANTS, but will panic
  with KASSERT enabled when SPX sockets are closed.
  
  MFC after:	3 days

Modified:
  head/sys/netipx/spx_usrreq.c

Modified: head/sys/netipx/spx_usrreq.c
==============================================================================
--- head/sys/netipx/spx_usrreq.c	Mon May 25 13:32:54 2009	(r192756)
+++ head/sys/netipx/spx_usrreq.c	Mon May 25 13:34:03 2009	(r192757)
@@ -1253,6 +1253,7 @@ spx_detach(struct socket *so)
 	IPX_LIST_LOCK();
 	IPX_LOCK(ipxp);
 	spx_pcbdetach(ipxp);
+	ipx_pcbdetach(ipxp);
 	ipx_pcbfree(ipxp);
 	IPX_LIST_UNLOCK();
 }