Restore spares used in "struct tcpcb" and bump "__FreeBSD_version" to

indicate need for kernel module re-compilation.

Sponsored by:	Mellanox Technologies

diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 84ac8f08ac138d5c2ac2f4a357a14b2847e96bcf..4353b7750e7015ddf2a5b2df6e919cd8d0ec086d 100644 (file)
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -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?) */
 };

diff --git a/sys/sys/param.h b/sys/sys/param.h
index 56f59b7bf48aa3bbfa967e1a06a12230f433e11c..2afa47d68fe88c68916720be25e24f4cc105f400 100644 (file)
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -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,