svn commit: r274046 - in head/sys: netinet sys

[Hans Petter Selasky]

Author: hselasky
Date: Mon Nov  3 13:01:58 2014
New Revision: 274046
URL: https://svnweb.freebsd.org/changeset/base/274046

Log:
  Restore spares used in "struct tcpcb" and bump "__FreeBSD_version" to
  indicate need for kernel module re-compilation.
  
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/netinet/tcp_var.h
  head/sys/sys/param.h

Modified: head/sys/netinet/tcp_var.h
==============================================================================
--- head/sys/netinet/tcp_var.h	Mon Nov  3 12:55:31 2014	(r274045)
+++ head/sys/netinet/tcp_var.h	Mon Nov  3 13:01:58 2014	(r274046)
@@ -200,13 +200,12 @@ struct tcpcb {
 	u_int	t_keepcnt;		/* number of keepalives before close */
 
 	u_int	t_tsomax;		/* TSO total burst length limit in bytes */
+	u_int	t_tsomaxsegcount;	/* TSO maximum segment count */
+	u_int	t_tsomaxsegsize;	/* TSO maximum segment size in bytes */
 	u_int	t_pmtud_saved_maxopd;	/* pre-blackhole MSS */
 	u_int	t_flags2;		/* More tcpcb flags storage */
 
-	uint32_t t_ispare[6];		/* 5 UTO, 1 TBD */
-	uint32_t t_tsomaxsegcount;	/* TSO maximum segment count */
-	uint32_t t_tsomaxsegsize;	/* TSO maximum segment size in bytes */
-
+	uint32_t t_ispare[8];		/* 5 UTO, 3 TBD */
 	void	*t_pspare2[4];		/* 1 TCP_SIGNATURE, 3 TBD */
 	uint64_t _pad[6];		/* 6 TBD (1-2 CC/RTT?) */
 };

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Mon Nov  3 12:55:31 2014	(r274045)
+++ head/sys/sys/param.h	Mon Nov  3 13:01:58 2014	(r274046)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100041	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100042	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,