From owner-p4-projects@FreeBSD.ORG  Mon Nov 26 14:09:30 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EEFF416A421; Mon, 26 Nov 2007 14:09:29 +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 9532B16A417
	for <perforce@FreeBSD.org>; Mon, 26 Nov 2007 14:09:29 +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 84A4013C4EC
	for <perforce@FreeBSD.org>; Mon, 26 Nov 2007 14:09:29 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAQE9Tro050498
	for <perforce@FreeBSD.org>; Mon, 26 Nov 2007 14:09:29 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAQE9TMH050495
	for perforce@freebsd.org; Mon, 26 Nov 2007 14:09:29 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Mon, 26 Nov 2007 14:09:29 GMT
Message-Id: <200711261409.lAQE9TMH050495@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 129560 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, 26 Nov 2007 14:09:30 -0000

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

Change 129560 by rpaulo@rpaulo_zoo on 2007/11/26 14:08:46

	* Correct a sequence number check.
	* Ignore TH_ECE and TH_CWR in the header prediction check.
	
	Tested in the netperf cluster. The tcpdump was analysed with
	wireshark and no packets were lost when ECN was enabled.

Affected files ...

.. //depot/projects/tcpecn/netinet/tcp_input.c#3 edit

Differences ...

==== //depot/projects/tcpecn/netinet/tcp_input.c#3 (text+ko) ====

@@ -968,7 +968,7 @@
 		 * Ignore if we are already trying to recover.
 		 */
 		if ((thflags & TH_ECE) &&
-		    SEQ_GEQ(tp->snd_una, tp->snd_recover))
+		    SEQ_LEQ(th->th_ack, tp->snd_recover))
 			tcp_congestion_exp(tp);
 	}
 
@@ -1040,8 +1040,7 @@
 	 */
 	if (tp->t_state == TCPS_ESTABLISHED &&
 	    th->th_seq == tp->rcv_nxt &&
-	    (thflags & (TH_SYN|TH_FIN|TH_RST|TH_URG|TH_ACK|TH_ECE|TH_CWR))
-	        == TH_ACK &&
+	    (thflags & (TH_SYN|TH_FIN|TH_RST|TH_URG|TH_ACK)) == TH_ACK &&
 	    tp->snd_nxt == tp->snd_max &&
 	    tiwin && tiwin == tp->snd_wnd && 
 	    ((tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN)) == 0) &&