From owner-svn-src-stable-8@FreeBSD.ORG  Sat Jan  8 02:24:00 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BA091065674;
	Sat,  8 Jan 2011 02:24:00 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 39A7A8FC16;
	Sat,  8 Jan 2011 02:24:00 +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 p082O0VM073695;
	Sat, 8 Jan 2011 02:24:00 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p082O0Hh073693;
	Sat, 8 Jan 2011 02:24:00 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201101080224.p082O0Hh073693@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 8 Jan 2011 02:24:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217141 - stable/8/sys/netinet
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Jan 2011 02:24:00 -0000

Author: bz
Date: Sat Jan  8 02:23:59 2011
New Revision: 217141
URL: http://svn.freebsd.org/changeset/base/217141

Log:
  Move the uint64_t to were the padding was before, rather than before all
  pad.  Keep them to the end so that the two pad[]s are kept together.
  This should restore ABI as well on platforms, where
     sizeof(void *) != sizeof(uint64_t)
  after r216968, r217018.
  
  Reviewed by:	gnn, jhb, lstewart

Modified:
  stable/8/sys/netinet/tcp_var.h

Modified: stable/8/sys/netinet/tcp_var.h
==============================================================================
--- stable/8/sys/netinet/tcp_var.h	Sat Jan  8 01:57:23 2011	(r217140)
+++ stable/8/sys/netinet/tcp_var.h	Sat Jan  8 02:23:59 2011	(r217141)
@@ -197,11 +197,12 @@ struct tcpcb {
 	int	t_bytes_acked;		/* # bytes acked during current RTT */
 
 	int	t_sndzerowin;	/* zero-window updates sent */
-	uint64_t	t_sndrexmitpack;/* retransmit packets sent */
-	uint64_t	t_rcvoopack;	/* out-of-order packets received */
 
 	void	*t_pspare2[6];		/* 2 CC / 4 TBD */
 	uint64_t _pad[10];		/* 7 UTO, 3 TBD (1-2 CC/RTT?) */
+
+	uint64_t	t_sndrexmitpack;/* retransmit packets sent */
+	uint64_t	t_rcvoopack;	/* out-of-order packets received */
 };
 
 /*