From owner-p4-projects@FreeBSD.ORG Mon Aug 4 05:06:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B903E106567F; Mon, 4 Aug 2008 05:06:26 +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 7D4871065676
for <perforce@freebsd.org>; Mon, 4 Aug 2008 05:06:26 +0000 (UTC)
(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 6ADE98FC1E
for <perforce@freebsd.org>; Mon, 4 Aug 2008 05:06:26 +0000 (UTC)
(envelope-from julian@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 m7456QMW084336
for <perforce@freebsd.org>; Mon, 4 Aug 2008 05:06:26 GMT
(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7456QDt084334
for perforce@freebsd.org; Mon, 4 Aug 2008 05:06:26 GMT
(envelope-from julian@freebsd.org)
Date: Mon, 4 Aug 2008 05:06:26 GMT
Message-Id: <200808040506.m7456QDt084334@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 146594 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2008 05:06:27 -0000
http://perforce.freebsd.org/chv.cgi?CH=146594
Change 146594 by julian@julian_trafmon1 on 2008/08/04 05:06:03
cope with new globals from ecn
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#5 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#7 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#4 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#5 (text+ko) ====
@@ -1369,7 +1369,7 @@
else
tp->t_flags |= TF_ACKNOW;
- if ((thflags & TH_ECE) && tcp_do_ecn) {
+ if ((thflags & TH_ECE) && V_tcp_do_ecn) {
tp->t_flags |= TF_ECN_PERMIT;
tcpstat.tcps_ecn_shs++;
}
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#6 (text+ko) ====
@@ -884,9 +884,9 @@
* resend those bits a number of times as per
* RFC 3168.
*/
- if (tp->t_state == TCPS_SYN_SENT && tcp_do_ecn) {
+ if (tp->t_state == TCPS_SYN_SENT && V_tcp_do_ecn) {
if (tp->t_rxtshift >= 1) {
- if (tp->t_rxtshift <= tcp_ecn_maxretries)
+ if (tp->t_rxtshift <= V_tcp_ecn_maxretries)
flags |= TH_ECE|TH_CWR;
} else
flags |= TH_ECE|TH_CWR;
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#7 (text+ko) ====
@@ -1237,7 +1237,7 @@
sc->sc_peer_mss = to->to_mss; /* peer mss may be zero */
if (noopt)
sc->sc_flags |= SCF_NOOPT;
- if ((th->th_flags & (TH_ECE|TH_CWR)) && tcp_do_ecn)
+ if ((th->th_flags & (TH_ECE|TH_CWR)) && V_tcp_do_ecn)
sc->sc_flags |= SCF_ECN;
if (tcp_syncookies) {
==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#4 (text+ko) ====
@@ -270,6 +270,7 @@
#define V_tcp_delack_enabled tcp_delack_enabled
#define V_tcp_do_autorcvbuf tcp_do_autorcvbuf
#define V_tcp_do_autosndbuf tcp_do_autosndbuf
+#define V_tcp_do_ecn tcp_do_ecn
#define V_tcp_do_newreno tcp_do_newreno
#define V_tcp_do_rfc1323 tcp_do_rfc1323
#define V_tcp_do_rfc3042 tcp_do_rfc3042
@@ -277,6 +278,7 @@
#define V_tcp_do_sack tcp_do_sack
#define V_tcp_do_tso tcp_do_tso
#define V_tcp_hc_callout tcp_hc_callout
+#define V_tcp_ecn_maxretries tcp_ecn_maxretries
#define V_tcp_hostcache tcp_hostcache
#define V_tcp_inflight_enable tcp_inflight_enable
#define V_tcp_inflight_max tcp_inflight_max