From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 12 17:26:17 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 003F3106564A;
	Thu, 12 Feb 2009 17:26:16 +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 E285F8FC1C;
	Thu, 12 Feb 2009 17:26:16 +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 n1CHQG7d061987;
	Thu, 12 Feb 2009 17:26:16 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1CHQGgR061986;
	Thu, 12 Feb 2009 17:26:16 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200902121726.n1CHQGgR061986@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Thu, 12 Feb 2009 17:26:16 +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: r188522 - in stable/7/sys: . netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2009 17:26:17 -0000

Author: rrs
Date: Thu Feb 12 17:26:16 2009
New Revision: 188522
URL: http://svn.freebsd.org/changeset/base/188522

Log:
  MFC of 184030 - socket accept inherit bug. Basically
                  accepted sockets were not inheriting the proper
                  sock buf size.

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

Modified: stable/7/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/7/sys/netinet/sctp_usrreq.c	Thu Feb 12 16:40:48 2009	(r188521)
+++ stable/7/sys/netinet/sctp_usrreq.c	Thu Feb 12 17:26:16 2009	(r188522)
@@ -516,9 +516,11 @@ sctp_attach(struct socket *so, int proto
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
 		return EINVAL;
 	}
-	error = SCTP_SORESERVE(so, SCTP_BASE_SYSCTL(sctp_sendspace), SCTP_BASE_SYSCTL(sctp_recvspace));
-	if (error) {
-		return error;
+	if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
+		error = SCTP_SORESERVE(so, SCTP_BASE_SYSCTL(sctp_sendspace), SCTP_BASE_SYSCTL(sctp_recvspace));
+		if (error) {
+			return error;
+		}
 	}
 	error = sctp_inpcb_alloc(so, vrf_id);
 	if (error) {