Index: sys/net/if_var.h =================================================================== RCS file: /home/kmacy/devel/ncvs/src/sys/net/if_var.h,v retrieving revision 1.115 diff -d -u -r1.115 if_var.h --- sys/net/if_var.h 16 May 2007 18:37:37 -0000 1.115 +++ sys/net/if_var.h 7 Dec 2007 01:08:32 -0000 @@ -161,8 +161,7 @@ int (*if_resolvemulti) /* validate/resolve multicast */ (struct ifnet *, struct sockaddr **, struct sockaddr *); struct ifaddr *if_addr; /* pointer to link-level address */ - void *if_spare2; /* spare pointer 2 */ - void *if_spare3; /* spare pointer 3 */ + void *if_llsoftc; /* link layer softc */ int if_drv_flags; /* driver-managed status flags */ u_int if_spare_flags2; /* spare flags 2 */ struct ifaltq if_snd; /* output queue (includes altq) */ @@ -187,6 +186,8 @@ /* protected by if_addr_mtx */ void *if_pf_kif; void *if_lagg; /* lagg glue */ + void *if_pspare[10]; /* multiq/TOE 3; vimage 3; general use 4 */ + int if_ispare[2]; /* general use 2 */ }; typedef void if_init_f_t(void *); Index: sys/net80211/ieee80211.c =================================================================== RCS file: /home/kmacy/devel/ncvs/src/sys/net80211/ieee80211.c,v retrieving revision 1.44 diff -d -u -r1.44 ieee80211.c --- sys/net80211/ieee80211.c 23 Nov 2007 05:57:20 -0000 1.44 +++ sys/net80211/ieee80211.c 7 Dec 2007 01:16:50 -0000 @@ -275,8 +275,8 @@ if (ic->ic_reset == NULL) ic->ic_reset = ieee80211_default_reset; - KASSERT(ifp->if_spare2 == NULL, ("oops, hosed")); - ifp->if_spare2 = ic; /* XXX temp backpointer */ + KASSERT(ifp->if_llsoftc == NULL, ("oops, hosed")); + ifp->if_llsoftc = ic; } void Index: sys/net80211/ieee80211_output.c =================================================================== RCS file: /home/kmacy/devel/ncvs/src/sys/net80211/ieee80211_output.c,v retrieving revision 1.56 diff -d -u -r1.56 ieee80211_output.c --- sys/net80211/ieee80211_output.c 23 Nov 2007 06:24:57 -0000 1.56 +++ sys/net80211/ieee80211_output.c 6 Dec 2007 04:12:01 -0000 @@ -248,7 +248,7 @@ struct sockaddr *dst, struct rtentry *rt0) { #define senderr(e) do { error = (e); goto bad;} while (0) - struct ieee80211com *ic = ifp->if_spare2; /* XXX */ + struct ieee80211com *ic = ifp->if_llsoftc; /* XXX */ struct ieee80211_node *ni = NULL; struct ieee80211_frame *wh; int error; Index: sys/netinet/in_pcb.h =================================================================== RCS file: /home/kmacy/devel/ncvs/src/sys/netinet/in_pcb.h,v retrieving revision 1.100 diff -d -u -r1.100 in_pcb.h --- sys/netinet/in_pcb.h 6 Aug 2007 14:26:01 -0000 1.100 +++ sys/netinet/in_pcb.h 7 Dec 2007 01:40:06 -0000 @@ -113,19 +113,13 @@ struct inpcb { LIST_ENTRY(inpcb) inp_hash; /* hash list */ LIST_ENTRY(inpcb) inp_list; /* list for all PCBs of this proto */ - u_int32_t inp_flow; - - /* Local and foreign ports, local and foreign addr. */ - struct in_conninfo inp_inc; - void *inp_ppcb; /* pointer to per-protocol pcb */ struct inpcbinfo *inp_pcbinfo; /* PCB list info */ struct socket *inp_socket; /* back pointer to socket */ - /* list for this PCB's local port */ - struct label *inp_label; /* MAC label */ + + u_int32_t inp_flow; int inp_flags; /* generic IP/datagram flags */ - struct inpcbpolicy *inp_sp; /* for IPSEC */ u_char inp_vflag; /* IP version flag (v4/v6) */ #define INP_IPV4 0x1 #define INP_IPV6 0x2 @@ -137,6 +131,15 @@ u_char inp_ip_ttl; /* time to live proto */ u_char inp_ip_p; /* protocol proto */ u_char inp_ip_minttl; /* minimum TTL or drop */ + uint32_t inp_ispare1; /* connection id / queue id */ + void *inp_pspare[2]; /* rtentry / general use */ + + /* Local and foreign ports, local and foreign addr. */ + struct in_conninfo inp_inc; + + /* list for this PCB's local port */ + struct label *inp_label; /* MAC label */ + struct inpcbpolicy *inp_sp; /* for IPSEC */ /* Protocol-dependent part; options. */ struct { @@ -262,6 +265,12 @@ */ u_quad_t ipi_gencnt; struct mtx ipi_mtx; + + /* + * vimage 1 + * general use 1 + */ + void *ipi_pspare[2]; }; #define INP_LOCK_INIT(inp, d, t) \ Index: sys/netinet/tcp_syncache.c =================================================================== RCS file: /home/kmacy/devel/ncvs/src/sys/netinet/tcp_syncache.c,v retrieving revision 1.136 diff -d -u -r1.136 tcp_syncache.c --- sys/netinet/tcp_syncache.c 4 Dec 2007 07:11:13 -0000 1.136 +++ sys/netinet/tcp_syncache.c 5 Dec 2007 01:24:25 -0000 @@ -135,6 +135,9 @@ #define SCF_UNREACH 0x10 /* icmp unreachable received */ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ +#ifndef DISABLE_TCP_OFFLOAD + void *sc_pspare[2]; /* toepcb / toe_usrreqs */ +#endif #ifdef MAC struct label *sc_label; /* MAC label reference */ #endif Index: sys/netinet/tcp_var.h =================================================================== RCS file: /home/kmacy/devel/ncvs/src/sys/netinet/tcp_var.h,v retrieving revision 1.157 diff -d -u -r1.157 tcp_var.h --- sys/netinet/tcp_var.h 24 Sep 2007 05:26:24 -0000 1.157 +++ sys/netinet/tcp_var.h 7 Dec 2007 01:07:37 -0000 @@ -206,6 +206,7 @@ int t_rttlow; /* smallest observerved RTT */ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ + void *t_pspare[5]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ }; #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) Index: sys/sys/ucred.h =================================================================== RCS file: /home/kmacy/devel/ncvs/src/sys/sys/ucred.h,v retrieving revision 1.55 diff -d -u -r1.55 ucred.h --- sys/sys/ucred.h 7 Jun 2007 22:27:15 -0000 1.55 +++ sys/sys/ucred.h 7 Dec 2007 01:14:06 -0000 @@ -55,6 +55,7 @@ struct uidinfo *cr_uidinfo; /* per euid resource consumption */ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(2) */ + void *cr_pspare[3]; /* vimage 2; general use 1 */ #define cr_endcopy cr_label struct label *cr_label; /* MAC label */ struct auditinfo_addr cr_audit; /* Audit properties. */