From owner-svn-src-stable-7@FreeBSD.ORG  Thu Feb 12 16:40:48 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 764DE10656C1;
	Thu, 12 Feb 2009 16:40:48 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6498A8FC15;
	Thu, 12 Feb 2009 16:40:48 +0000 (UTC) (envelope-from rrs@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 n1CGem6M061022;
	Thu, 12 Feb 2009 16:40:48 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1CGemoZ061021;
	Thu, 12 Feb 2009 16:40:48 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200902121640.n1CGemoZ061021@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Thu, 12 Feb 2009 16:40:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188521 - in stable/7/sys: . netinet
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2009 16:40:49 -0000

Author: rrs
Date: Thu Feb 12 16:40:48 2009
New Revision: 188521
URL: http://svn.freebsd.org/changeset/base/188521

Log:
  Merges in 182268 from head close bug where we
  failed to NULL the sctp_socket.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/netinet/sctp_pcb.c

Modified: stable/7/sys/netinet/sctp_pcb.c
==============================================================================
--- stable/7/sys/netinet/sctp_pcb.c	Thu Feb 12 15:28:15 2009	(r188520)
+++ stable/7/sys/netinet/sctp_pcb.c	Thu Feb 12 16:40:48 2009	(r188521)
@@ -3270,6 +3270,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, 
 #ifdef SCTP_LOG_CLOSING
 			sctp_log_closing(inp, NULL, 2);
 #endif
+			inp->sctp_socket = NULL;
 			return;
 		}
 	}