From owner-svn-src-all@FreeBSD.ORG Wed Apr 8 12:49:37 2009 Return-Path: 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 19933106566B; Wed, 8 Apr 2009 12:49:37 +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 E1BB28FC0A; Wed, 8 Apr 2009 12:49:36 +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 n38CnaPS059339; Wed, 8 Apr 2009 12:49:36 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n38Cnaag059337; Wed, 8 Apr 2009 12:49:36 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200904081249.n38Cnaag059337@svn.freebsd.org> From: Randall Stewart Date: Wed, 8 Apr 2009 12:49:36 +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: r190842 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2009 12:49:37 -0000 Author: rrs Date: Wed Apr 8 12:49:36 2009 New Revision: 190842 URL: http://svn.freebsd.org/changeset/base/190842 Log: Add more padding and a new variable. This will help us be able to keep ABI compatibility between 8 and 9. MFC after: Never Modified: head/sys/netinet/sctp_sysctl.c head/sys/netinet/sctp_uio.h Modified: head/sys/netinet/sctp_sysctl.c ============================================================================== --- head/sys/netinet/sctp_sysctl.c Wed Apr 8 11:56:49 2009 (r190841) +++ head/sys/netinet/sctp_sysctl.c Wed Apr 8 12:49:36 2009 (r190842) @@ -463,7 +463,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS) xraddr.cwnd = net->cwnd; xraddr.flight_size = net->flight_size; xraddr.mtu = net->mtu; - /* xraddr.rtt = net->rtt; Not yet */ + xraddr.rtt = net->rtt; xraddr.start_time.tv_sec = (uint32_t) net->start_time.tv_sec; xraddr.start_time.tv_usec = (uint32_t) net->start_time.tv_usec; SCTP_INP_RUNLOCK(inp); Modified: head/sys/netinet/sctp_uio.h ============================================================================== --- head/sys/netinet/sctp_uio.h Wed Apr 8 11:56:49 2009 (r190841) +++ head/sys/netinet/sctp_uio.h Wed Apr 8 12:49:36 2009 (r190842) @@ -986,7 +986,7 @@ struct xsctp_inpcb { uint16_t local_port; uint16_t qlen; uint16_t maxqlen; - uint32_t extra_padding[8]; /* future */ + uint32_t extra_padding[32]; /* future */ }; struct xsctp_tcb { @@ -1017,14 +1017,14 @@ struct xsctp_tcb { struct sctp_timeval discontinuity_time; /* sctpAssocEntry 17 */ uint32_t peers_rwnd; sctp_assoc_t assoc_id; /* sctpAssocEntry 1 */ - uint32_t extra_padding[8]; /* future */ + uint32_t extra_padding[32]; /* future */ }; struct xsctp_laddr { union sctp_sockstore address; /* sctpAssocLocalAddrEntry 1/2 */ uint32_t last; struct sctp_timeval start_time; /* sctpAssocLocalAddrEntry 3 */ - uint32_t extra_padding[8]; /* future */ + uint32_t extra_padding[32]; /* future */ }; struct xsctp_raddr { @@ -1041,8 +1041,8 @@ struct xsctp_raddr { uint8_t confirmed; /* */ uint8_t heartbeat_enabled; /* sctpAssocLocalRemEntry 4 */ struct sctp_timeval start_time; /* sctpAssocLocalRemEntry 8 */ - uint32_t extra_padding[8]; /* future */ - + uint32_t rtt; + uint32_t extra_padding[32]; /* future */ }; #define SCTP_MAX_LOGGING_SIZE 30000