PERFORCE change 195085 for review

[Catalin Nicutar]

http://p4web.freebsd.org/@@195085?ac=10

Change 195085 by cnicutar at cnicutar_cronos on 2011/06/21 07:24:32

	Fix ABI compatibility (broken in 194756)

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_var.h#3 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_var.h#3 (text+ko) ====

@@ -198,14 +198,15 @@
 
 	int	t_sndzerowin;	/* zero-window updates sent */
 
-	uint32_t snd_uto;	/* sent timeout */
-	uint32_t rcv_uto;	/* received suggestion from peer */
 
 	void	*t_pspare2[6];		/* 2 CC / 4 TBD */
-	uint64_t _pad[9];		/* 6 UTO, 3 TBD (1-2 CC/RTT?) */
+	uint64_t _pad[8];		/* 5 UTO, 3 TBD (1-2 CC/RTT?) */
 
 	uint64_t	t_sndrexmitpack;/* retransmit packets sent */
 	uint64_t	t_rcvoopack;	/* out-of-order packets received */
+
+	uint64_t snd_uto;		/* sent timeout */
+	uint64_t rcv_uto;		/* received suggestion from peer */
 };
 
 /*
@@ -575,6 +576,7 @@
 VNET_DECLARE(int, path_mtu_discovery);
 VNET_DECLARE(int, ss_fltsz);
 VNET_DECLARE(int, ss_fltsz_local);
+VNET_DECLARE(int, uto_enable);
 VNET_DECLARE(int, uto_min_timeout);
 VNET_DECLARE(int, uto_max_timeout);
 VNET_DECLARE(int, uto_def_timeout);
@@ -591,6 +593,7 @@
 #define	V_path_mtu_discovery	VNET(path_mtu_discovery)
 #define	V_ss_fltsz		VNET(ss_fltsz)
 #define	V_ss_fltsz_local	VNET(ss_fltsz_local)
+#define V_uto_enable		VNET(uto_enable)
 #define V_uto_min_timeout	VNET(uto_min_timeout)
 #define V_uto_max_timeout	VNET(uto_max_timeout)
 #define V_uto_def_timeout	VNET(uto_def_timeout)