From owner-svn-src-all@FreeBSD.ORG  Wed Jan 26 19:55:54 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 588C5106567A;
	Wed, 26 Jan 2011 19:55:54 +0000 (UTC)
	(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 480248FC0A;
	Wed, 26 Jan 2011 19:55:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0QJtsga087740;
	Wed, 26 Jan 2011 19:55:54 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0QJtssi087738;
	Wed, 26 Jan 2011 19:55:54 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201101261955.p0QJtssi087738@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Wed, 26 Jan 2011 19:55:54 +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: r217895 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jan 2011 19:55:54 -0000

Author: tuexen
Date: Wed Jan 26 19:55:54 2011
New Revision: 217895
URL: http://svn.freebsd.org/changeset/base/217895

Log:
  Make SCTP_MAX_BURST compliant with the latest version of
  the socket API ID. This is not compatible with the API
  in stable/8.

Modified:
  head/sys/netinet/sctp_usrreq.c

Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c	Wed Jan 26 19:49:03 2011	(r217894)
+++ head/sys/netinet/sctp_usrreq.c	Wed Jan 26 19:55:54 2011	(r217895)
@@ -1967,18 +1967,21 @@ flags_out:
 		break;
 	case SCTP_MAX_BURST:
 		{
-			uint8_t *value;
+			struct sctp_assoc_value *av;
 
-			SCTP_CHECK_AND_CAST(value, optval, uint8_t, *optsize);
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
 
-			SCTP_INP_RLOCK(inp);
-			if (inp->sctp_ep.max_burst < 256) {
-				*value = inp->sctp_ep.max_burst;
+			if (stcb) {
+				av->assoc_value = stcb->asoc.max_burst;
+				SCTP_TCB_UNLOCK(stcb);
 			} else {
-				*value = 255;
+				SCTP_INP_RLOCK(inp);
+				av->assoc_value = inp->sctp_ep.max_burst;
+				SCTP_INP_RUNLOCK(inp);
 			}
-			SCTP_INP_RUNLOCK(inp);
-			*optsize = sizeof(uint8_t);
+			*optsize = sizeof(struct sctp_assoc_value);
+
 		}
 		break;
 	case SCTP_MAXSEG:
@@ -3590,13 +3593,19 @@ sctp_setopt(struct socket *so, int optna
 		break;
 	case SCTP_MAX_BURST:
 		{
-			uint8_t *burst;
+			struct sctp_assoc_value *av;
 
-			SCTP_CHECK_AND_CAST(burst, optval, uint8_t, optsize);
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
 
-			SCTP_INP_WLOCK(inp);
-			inp->sctp_ep.max_burst = *burst;
-			SCTP_INP_WUNLOCK(inp);
+			if (stcb) {
+				stcb->asoc.max_burst = av->assoc_value;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				SCTP_INP_WLOCK(inp);
+				inp->sctp_ep.max_burst = av->assoc_value;
+				SCTP_INP_WUNLOCK(inp);
+			}
 		}
 		break;
 	case SCTP_MAXSEG: