PERFORCE change 148309 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=148309

Change 148309 by julian at julian_trafmon1 on 2008/08/25 00:44:02

	loop back sysncach change we already have
	 (and catch if_wpi.c while here)

Affected files ...

.. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#37 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#15 integrate

Differences ...

==== //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#7 (text+ko) ====

@@ -19,7 +19,7 @@
 #define VERSION "20071127"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.16 2008/06/23 15:40:56 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.17 2008/08/24 22:42:39 benjsc Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -148,10 +148,10 @@
 	{ 0x8086, 0x4222,    0x0, "Intel(R) PRO/Wireless 3945ABG" },
 	{ 0x8086, 0x4227,    0x0, "Intel(R) PRO/Wireless 3945ABG" },
 	/* The below entries only support BG */
-	{ 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945AB"  },
-	{ 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945AB"  },
-	{ 0x8086, 0x4222, 0x1014, "Intel(R) PRO/Wireless 3945AB"  },
-	{ 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945AB"  },
+	{ 0x8086, 0x4222, 0x1005, "Intel(R) PRO/Wireless 3945BG"  },
+	{ 0x8086, 0x4222, 0x1034, "Intel(R) PRO/Wireless 3945BG"  },
+	{ 0x8086, 0x4227, 0x1014, "Intel(R) PRO/Wireless 3945BG"  },
+	{ 0x8086, 0x4222, 0x1044, "Intel(R) PRO/Wireless 3945BG"  },
 	{ 0, 0, 0, NULL }
 };
 

==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#37 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.154 2008/08/23 14:22:12 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.155 2008/08/25 00:33:30 julian Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"

==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#15 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.3 2008/07/21 02:11:06 kmacy Exp $
+ * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.4 2008/08/25 00:33:30 julian Exp $
  */
 
 #ifndef _NETINET_TCP_SYNCACHE_H_
@@ -61,8 +61,7 @@
 struct syncache {
 	TAILQ_ENTRY(syncache)	sc_hash;
 	struct		in_conninfo sc_inc;	/* addresses */
-	u_long		sc_rxttime;		/* retransmit time */
-	u_int16_t	sc_flags;
+	int		sc_rxttime;		/* retransmit time */
 	u_int16_t	sc_rxmits;		/* retransmit counter */
 
 	u_int32_t	sc_tsreflect;		/* timestamp to reflect */
@@ -79,6 +78,7 @@
 	u_int8_t	sc_ip_tos;		/* IPv4 TOS */
 	u_int8_t	sc_requested_s_scale:4,
 			sc_requested_r_scale:4;
+	u_int16_t	sc_flags;
 #define SCF_NOOPT	0x01			/* no TCP options */
 #define SCF_WINSCALE	0x02			/* negotiated window scaling */
 #define SCF_TIMESTAMP	0x04			/* negotiated timestamps */
@@ -86,24 +86,23 @@
 #define SCF_UNREACH	0x10			/* icmp unreachable received */
 #define SCF_SIGNATURE	0x20			/* send MD5 digests */
 #define SCF_SACK	0x80			/* send SACK option */
-#define SCF_ECN		0x100			/* ECN enabled */
+#define SCF_ECN		0x100			/* send ECN setup packet */
 #ifndef TCP_OFFLOAD_DISABLE
 	struct toe_usrreqs *sc_tu;		/* TOE operations */
-	void		*sc_toepcb;		/* TOE protocol block */
-#endif
+	void 		*sc_toepcb;		/* TOE protocol block */
+#endif			
 #ifdef MAC
 	struct label	*sc_label;		/* MAC label reference */
 #endif
 	struct ucred	*sc_cred;		/* cred cache for jail checks */
 };
 
-#define SYNCOOKIE_SECRET_SIZE	8	/* dwords */
-#define SYNCOOKIE_LIFETIME	16	/* seconds */
+#define	SYNCOOKIE_SECRET_SIZE	8	/* dwords */
+#define	SYNCOOKIE_LIFETIME	16	/* seconds */
 
 struct syncache_head {
 	struct mtx	sch_mtx;
 	TAILQ_HEAD(sch_head, syncache)	sch_bucket;
-	struct		vnet *sch_vnet;
 	struct callout	sch_timer;
 	int		sch_nextc;
 	u_int		sch_length;
@@ -126,4 +125,4 @@
 };
 
 #endif /* _KERNEL */
-#endif /* !_NETINET_TCP_SYNCACHE_H_ */
+#endif /* _NETINET_TCP_SYNCACHE_H_ */