From owner-p4-projects@FreeBSD.ORG Wed Jul 30 19:26:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF4A3106567E; Wed, 30 Jul 2008 19:26:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B33EF1065678 for ; Wed, 30 Jul 2008 19:26:14 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A6D5A8FC15 for ; Wed, 30 Jul 2008 19:26:14 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6UJQEQ5011113 for ; Wed, 30 Jul 2008 19:26:14 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6UJQErF011111 for perforce@freebsd.org; Wed, 30 Jul 2008 19:26:14 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 30 Jul 2008 19:26:14 GMT Message-Id: <200807301926.m6UJQErF011111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 146260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jul 2008 19:26:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=146260 Change 146260 by rpaulo@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 */