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)

1 files changed, 3 insertions, 2 deletions

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