PERFORCE change 147441 for review

[Marko Zec]

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

Change 147441 by zec at zec_tinderbox on 2008/08/15 11:54:06

	Unbreak GENERIC build.

Affected files ...

.. //depot/projects/vimage-commit/src/sys/netinet/in.h#3 edit
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#5 edit
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#6 edit
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#7 edit
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#4 edit
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#5 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/netinet/in.h#3 (text+ko) ====

@@ -1009,6 +1009,8 @@
 #define V_tcp_reass_qsize	VNET_INET(tcp_reass_qsize)
 #define V_tcp_reass_maxqlen	VNET_INET(tcp_reass_maxqlen)
 #define V_tcp_reass_overflows	VNET_INET(tcp_reass_overflows)
+#define V_tcp_do_ecn		VNET_INET(tcp_do_ecn)
+#define V_tcp_ecn_maxretries	VNET_INET(tcp_ecn_maxretries)
 
 #define V_isn_secret		VNET_INET(isn_secret)
 #define V_isn_last_reseed	VNET_INET(isn_last_reseed)

==== //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#5 (text+ko) ====

@@ -133,11 +133,11 @@
 
 SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN");
 
-static int tcp_do_ecn = 0;
+int	tcp_do_ecn = 0;
+int	tcp_ecn_maxretries = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable,
     CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support");
 
-static int tcp_ecn_maxretries = 1;
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries,
     CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN");
 

==== //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#6 (text+ko) ====


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

@@ -139,6 +139,7 @@
 #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			/* send ECN setup packet */
 #ifndef TCP_OFFLOAD_DISABLE
 	struct toe_usrreqs *sc_tu;		/* TOE operations */
 	void 		*sc_toepcb;		/* TOE protocol block */

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


==== //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#5 (text+ko) ====

@@ -521,9 +521,6 @@
 extern	int tcp_sc_rst_sock_fail;	/* RST on sock alloc failure */
 extern	int tcp_do_ecn;			/* TCP ECN enabled/disabled */
 extern	int tcp_ecn_maxretries;
-extern	int tcp_sack_maxholes;
-extern	int tcp_sack_globalmaxholes;
-extern	int tcp_sack_globalholes;
 extern	int tcp_do_tso;
 extern	int tcp_do_autosndbuf;
 extern	int tcp_autosndbuf_max;