svn commit: r217141 - stable/8/sys/netinet

Bjoern A. Zeeb bz at FreeBSD.org
Sat Jan 8 02:24:00 UTC 2011


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 */
 };
 
 /*


More information about the svn-src-stable mailing list