From d9a362862c59a04ac3069e42f2aa681fa3ff693c Mon Sep 17 00:00:00 2001
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 17 Jul 2011 21:15:20 +0000
Subject: [PATCH] Add spares to the network stack for FreeBSD-9: - TCP keep*
 timers - TCP UTO (adjust from what was there already) - netmap - route
 caching - user cookie (temporary to allow for the real fix)

Slightly re-shuffle struct ifnet moving fields out of the middle
of spares and to better align.

Discussed with:	rwatson (slightly earlier version)
---
 sys/net/if_var.h           | 6 +++---
 sys/net/radix.h            | 1 +
 sys/netinet/in_pcb.h       | 5 +++--
 sys/netinet/tcp_syncache.h | 2 ++
 sys/netinet/tcp_var.h      | 5 +++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index d6eb7f11a025..2dcb6f9d053b 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -195,8 +195,9 @@ struct ifnet {
 					/* protected by if_addr_mtx */
 	void	*if_pf_kif;
 	void	*if_lagg;		/* lagg glue */
-	u_char	if_alloctype;		/* if_type at time of allocation */
+	char	*if_description;	/* interface description */
 	u_int	if_fib;			/* interface FIB */
+	u_char	if_alloctype;		/* if_type at time of allocation */
 
 	/*
 	 * Spare fields are added so that we can modify sensitive data
@@ -204,9 +205,8 @@ struct ifnet {
 	 * be used with care where binary compatibility is required.
 	 */
 	char	if_cspare[3];
-	char	*if_description;	/* interface description */
-	void	*if_pspare[7];
 	int	if_ispare[4];
+	void	*if_pspare[8];		/* 1 netmap, 7 TDB */
 };
 
 typedef void if_init_f_t(void *);
diff --git a/sys/net/radix.h b/sys/net/radix.h
index 29659b546519..0dc11e98746d 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -132,6 +132,7 @@ struct radix_node_head {
 		(struct radix_node *rn, struct radix_node_head *head);
 	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
 	int	rnh_multipath;			/* multipath capable ? */
+	u_int	rnh_spare;			/* route caching */
 #ifdef _KERNEL
 	struct	rwlock rnh_lock;		/* locks entire radix tree */
 #endif
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index dfef96348efe..55270ec5c7d4 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -179,8 +179,9 @@ struct inpcb {
 	u_char	inp_ip_minttl;		/* (i) minimum TTL or drop */
 	uint32_t inp_flowid;		/* (x) flow id / queue id */
 	u_int	inp_refcount;		/* (i) refcount */
-	void	*inp_pspare[4];		/* (x) rtentry / general use */
-	u_int	inp_ispare[4];		/* general use */
+	void	*inp_pspare[5];		/* (x) route caching / general use */
+	u_int	inp_ispare[6];		/* (x) route caching / user cookie /
+					 *     general use */
 
 	/* Local and foreign ports, local and foreign addr. */
 	struct	in_conninfo inp_inc;	/* (i/p) list for PCB's local port */
diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h
index ddfa4598d27d..5783b6d10900 100644
--- a/sys/netinet/tcp_syncache.h
+++ b/sys/netinet/tcp_syncache.h
@@ -81,6 +81,8 @@ struct syncache {
 #endif			
 	struct label	*sc_label;		/* MAC label reference */
 	struct ucred	*sc_cred;		/* cred cache for jail checks */
+
+	u_int32_t	sc_spare[2];		/* UTO */
 };
 
 /*
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index e8189b020357..bbf392f6368a 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -203,9 +203,9 @@ struct tcpcb {
 	struct cc_var	*ccv;		/* congestion control specific vars */
 	struct osd	*osd;		/* storage for Khelp module data */
 
-	int	t_ispare;		/* explicit pad for 64bit alignment */
+	uint32_t t_ispare[12];		/* 4 keep timers, 5 UTO, 3 TBD */
 	void	*t_pspare2[4];		/* 4 TBD */
-	uint64_t _pad[12];		/* 7 UTO, 5 TBD (1-2 CC/RTT?) */
+	uint64_t _pad[6];		/* 6 TBD (1-2 CC/RTT?) */
 };
 
 /*
@@ -300,6 +300,7 @@ struct tcpopt {
 	u_int16_t	to_mss;		/* maximum segment size */
 	u_int8_t	to_wscale;	/* window scaling */
 	u_int8_t	to_nsacks;	/* number of SACK blocks */
+	u_int32_t	to_spare;	/* UTO */
 };
 
 /*