From owner-cvs-src@FreeBSD.ORG  Mon Apr  3 09:52:59 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4D98D16A41F;
	Mon,  3 Apr 2006 09:52:59 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 57CA943D5F;
	Mon,  3 Apr 2006 09:52:56 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k339qu63075514;
	Mon, 3 Apr 2006 09:52:56 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k339qui5075513;
	Mon, 3 Apr 2006 09:52:56 GMT (envelope-from rwatson)
Message-Id: <200604030952.k339qui5075513@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 3 Apr 2006 09:52:56 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/netinet tcp_usrreq.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Apr 2006 09:52:59 -0000

rwatson     2006-04-03 09:52:56 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          tcp_usrreq.c 
  Log:
  After checking for SO_ISDISCONNECTED in tcp_usr_accept(), return
  immediately rather than jumping to the normal output handling, which
  assumes we've pulled out the inpcb, which hasn't happened at this
  point (and isn't necessary).
  
  Return ECONNABORTED instead of EINVAL when the inpcb has entered
  INP_TIMEWAIT or INP_DROPPED, as this is the documented error value.
  
  This may correct the panic seen by Ganbold.
  
  MFC after:      1 month
  Reported by:    Ganbold <ganbold at micom dot mng dot net>
  
  Revision  Changes    Path
  1.134     +3 -5      src/sys/netinet/tcp_usrreq.c