From owner-svn-src-stable@freebsd.org Wed Jul 1 21:40:28 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 307B835C07A; Wed, 1 Jul 2020 21:40:28 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49xvlw0SXsz3ZSD; Wed, 1 Jul 2020 21:40:28 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E75E7FF41; Wed, 1 Jul 2020 21:40:27 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 061LeRCK019920; Wed, 1 Jul 2020 21:40:27 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 061LeRtY019919; Wed, 1 Jul 2020 21:40:27 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202007012140.061LeRtY019919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Wed, 1 Jul 2020 21:40:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r362869 - stable/12/sys/netinet X-SVN-Group: stable-12 X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: stable/12/sys/netinet X-SVN-Commit-Revision: 362869 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2020 21:40:28 -0000 Author: tuexen Date: Wed Jul 1 21:40:27 2020 New Revision: 362869 URL: https://svnweb.freebsd.org/changeset/base/362869 Log: MFC r356226: Clear the flag indicating that the last received packet was marked CE also in the case where a packet not marked was received. Submitted by: rscheff Reviewed by: rgrimes, tuexen Differential Revision: https://reviews.freebsd.org/D19143 Modified: stable/12/sys/netinet/tcp_input.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet/tcp_input.c ============================================================================== --- stable/12/sys/netinet/tcp_input.c Wed Jul 1 21:37:32 2020 (r362868) +++ stable/12/sys/netinet/tcp_input.c Wed Jul 1 21:40:27 2020 (r362869) @@ -500,14 +500,15 @@ cc_ecnpkt_handler(struct tcpcb *tp, struct tcphdr *th, if (CC_ALGO(tp)->ecnpkt_handler != NULL) { switch (iptos & IPTOS_ECN_MASK) { case IPTOS_ECN_CE: - tp->ccv->flags |= CCF_IPHDR_CE; - break; + tp->ccv->flags |= CCF_IPHDR_CE; + break; case IPTOS_ECN_ECT0: - tp->ccv->flags &= ~CCF_IPHDR_CE; - break; + /* FALLTHROUGH */ case IPTOS_ECN_ECT1: - tp->ccv->flags &= ~CCF_IPHDR_CE; - break; + /* FALLTHROUGH */ + case IPTOS_ECN_NOTECT: + tp->ccv->flags &= ~CCF_IPHDR_CE; + break; } if (th->th_flags & TH_CWR)