From owner-svn-src-head@FreeBSD.ORG Thu Aug 22 20:29:59 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 12786E86; Thu, 22 Aug 2013 20:29:59 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DAD062F2B; Thu, 22 Aug 2013 20:29:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7MKTwVU014902; Thu, 22 Aug 2013 20:29:58 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7MKTwWL014898; Thu, 22 Aug 2013 20:29:58 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201308222029.r7MKTwWL014898@svn.freebsd.org> From: Michael Tuexen Date: Thu, 22 Aug 2013 20:29:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254672 - in head/sys: netinet sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2013 20:29:59 -0000 Author: tuexen Date: Thu Aug 22 20:29:57 2013 New Revision: 254672 URL: http://svnweb.freebsd.org/changeset/base/254672 Log: Export the inpcb features as a 64-bit entity. Bump __FreeBSD_version to 1000048 since the modified structure is user visible and used by netstat, for example. Modified: head/sys/netinet/sctp_sysctl.c head/sys/netinet/sctp_uio.h head/sys/sys/param.h Modified: head/sys/netinet/sctp_sysctl.c ============================================================================== --- head/sys/netinet/sctp_sysctl.c Thu Aug 22 20:07:06 2013 (r254671) +++ head/sys/netinet/sctp_sysctl.c Thu Aug 22 20:29:57 2013 (r254672) @@ -402,7 +402,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS) xinpcb.last = 0; xinpcb.local_port = ntohs(inp->sctp_lport); xinpcb.flags = inp->sctp_flags; - xinpcb.features = (uint32_t) inp->sctp_features; + xinpcb.features = inp->sctp_features; xinpcb.total_sends = inp->total_sends; xinpcb.total_recvs = inp->total_recvs; xinpcb.total_nospaces = inp->total_nospaces; Modified: head/sys/netinet/sctp_uio.h ============================================================================== --- head/sys/netinet/sctp_uio.h Thu Aug 22 20:07:06 2013 (r254671) +++ head/sys/netinet/sctp_uio.h Thu Aug 22 20:29:57 2013 (r254672) @@ -1149,7 +1149,7 @@ union sctp_sockstore { struct xsctp_inpcb { uint32_t last; uint32_t flags; - uint32_t features; + uint64_t features; uint32_t total_sends; uint32_t total_recvs; uint32_t total_nospaces; @@ -1157,7 +1157,7 @@ struct xsctp_inpcb { uint16_t local_port; uint16_t qlen; uint16_t maxqlen; - uint32_t extra_padding[32]; /* future */ + uint32_t extra_padding[31]; /* future */ }; struct xsctp_tcb { Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Thu Aug 22 20:07:06 2013 (r254671) +++ head/sys/sys/param.h Thu Aug 22 20:29:57 2013 (r254672) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000047 /* Master, propagated to newvers */ +#define __FreeBSD_version 1000048 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,