From owner-svn-src-all@FreeBSD.ORG  Fri May 25 11:14:08 2012
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 B7C25106564A;
	Fri, 25 May 2012 11:14:08 +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 A2C0E8FC0C;
	Fri, 25 May 2012 11:14:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4PBE8do007143;
	Fri, 25 May 2012 11:14:08 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4PBE8FC007141;
	Fri, 25 May 2012 11:14:08 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201205251114.q4PBE8FC007141@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Fri, 25 May 2012 11:14:08 +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: r235990 - 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: Fri, 25 May 2012 11:14:08 -0000

Author: tuexen
Date: Fri May 25 11:14:08 2012
New Revision: 235990
URL: http://svn.freebsd.org/changeset/base/235990

Log:
  Undefine SCTP_PACKED before including sctp_uio.h, which doesn't
  use it. Spotted by Irene Ruengeler.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctp.h

Modified: head/sys/netinet/sctp.h
==============================================================================
--- head/sys/netinet/sctp.h	Fri May 25 10:08:48 2012	(r235989)
+++ head/sys/netinet/sctp.h	Fri May 25 11:14:08 2012	(r235990)
@@ -556,6 +556,8 @@ struct sctp_error_unrecognized_chunk {
 #define SCTP_SMALLEST_PMTU 512	/* smallest pmtu allowed when disabling PMTU
 				 * discovery */
 
+#undef SCTP_PACKED
+
 #include <netinet/sctp_uio.h>
 
 /* This dictates the size of the packet
@@ -607,7 +609,4 @@ struct sctp_error_unrecognized_chunk {
 #define SCTP_LOG_AT_SEND_2_OUTQ				0x08000000
 #define SCTP_LOG_TRY_ADVANCE				0x10000000
 
-
-#undef SCTP_PACKED
-
 #endif				/* !_NETINET_SCTP_H_ */