PERFORCE change 146260 for review

[Rui Paulo]

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

Change 146260 by rpaulo at rpaulo_zoo on 2008/07/30 19:25:30

	Don't break ABI more than we need.
	Style changes.

Affected files ...

.. //depot/projects/tcpecn/netinet/tcp_syncache.c#9 edit
.. //depot/projects/tcpecn/netinet/tcp_var.h#9 edit

Differences ...

==== //depot/projects/tcpecn/netinet/tcp_syncache.c#9 (text+ko) ====

@@ -129,7 +129,9 @@
 	u_int8_t	sc_ip_tos;		/* IPv4 TOS */
 	u_int8_t	sc_requested_s_scale:4,
 			sc_requested_r_scale:4;
+	u_int_8_t	_pad1;
 	u_int16_t	sc_flags;
+	u_int16_t	_pad2;
 #define SCF_NOOPT	0x01			/* no TCP options */
 #define SCF_WINSCALE	0x02			/* negotiated window scaling */
 #define SCF_TIMESTAMP	0x04			/* negotiated timestamps */
@@ -1237,7 +1239,7 @@
 		sc->sc_flags |= SCF_NOOPT;
 	if ((th->th_flags & (TH_ECE|TH_CWR)) && tcp_do_ecn)
 		sc->sc_flags |= SCF_ECN;
-	
+
 	if (tcp_syncookies) {
 		syncookie_generate(sch, sc, &flowtmp);
 #ifdef INET6
@@ -1379,7 +1381,7 @@
 		th->th_flags |= TH_ECE;
 		tcpstat.tcps_ecn_shs++;
 	}
-	
+
 	/* Tack on the TCP options. */
 	if ((sc->sc_flags & SCF_NOOPT) == 0) {
 		to.to_flags = 0;

==== //depot/projects/tcpecn/netinet/tcp_var.h#9 (text+ko) ====

@@ -100,7 +100,7 @@
 
 	struct	inpcb *t_inpcb;		/* back pointer to internet pcb */
 	int	t_state;		/* state of this connection */
-	u_long	t_flags;
+	u_int	t_flags;
 #define	TF_ACKNOW	0x000001	/* ack peer immediately */
 #define	TF_DELACK	0x000002	/* ack, but try to delay it */
 #define	TF_NODELAY	0x000004	/* don't delay packets to coalesce */