From nobody Mon Feb 07 13:33:03 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 023E219477FC; Mon, 7 Feb 2022 13:33:04 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JsnC36fsZz4q9N; Mon, 7 Feb 2022 13:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644240783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xO4Yb01SPESXkUGTnRtyVyV9PxPOihGu69KSzfnPRwQ=; b=PQ4p4ggtbefwfG6QsEUPKBE3Zvk5LRnGvj8980WGWMNZNvWijlP6Khtccp3RpuaOHwoLkC D51DrUEy99hCDRrBj4My2IGsY4qMSR6KWwaXp5JL0E7gD8BC6ru6Fht+NL2hjkHvAGdjvM 6uGGr+fFEQ3rgA1NGRMUuuUlDcTvwrQS9D+q/GaySstf0SiwbBz1ToksRycgQmiz1qRIO+ ACzaHLu21VyXK7TJNqrD4Sm9EQ8MkZWr+uGqoxWaBsk16Wcq8AMXhKHSlsxkhQ752jBdOn T3vxuEO7Cq/bzq/FM2rtzWwaHM5tTckibeijXS+dRzgEVy8rFfcKqOfYt5Wqjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C44B525FF8; Mon, 7 Feb 2022 13:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217DX3s0057425; Mon, 7 Feb 2022 13:33:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217DX31F057424; Mon, 7 Feb 2022 13:33:03 GMT (envelope-from git) Date: Mon, 7 Feb 2022 13:33:03 GMT Message-Id: <202202071333.217DX31F057424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: ab001fcdf22d - main - tcp: Apply tcp flags after ECN processing in rack_fast_output() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab001fcdf22d8ea7ffad43f8e7896b73c0fdc3b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644240783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xO4Yb01SPESXkUGTnRtyVyV9PxPOihGu69KSzfnPRwQ=; b=HEaQxAsGUmQrnCX9uJVGYcpe9mODagxw6NxVKVsKcZgI/ze63M28GjKNSvFjFR1GfBph7m mnqpTlMWSvihVShm4xyBPZkVM4U0E2MPTizfmDjZPr75M0+P5z8BwiXOHwvGe4vVt6Z6QS SVMpJaxUPuoCVsYFm4NPB5kLbkuxzB1HK9k72GCkgfoch5aliU+N+rbm01JkPOQM2KAIbl z9EGm8vHmyd5RiEpj4awkNgndLG9zD6Q7HLQj7VaBeL8wE/gm29UPukSEhW6tQ8QX2JkIt VUz+r1D2+LFPVBrpEhgV9tGoHU8PNhODkGG3rcXVoV6tOClWIHqjPp1n06Gtyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644240783; a=rsa-sha256; cv=none; b=rZrNonrGucGsQ5vmVREq8oRQ8mHOqPKvHimFA4DnDozE3m2gon3DEpFgHbAlWPFIFtDrmX Q673UiZURMSV3s7NBRkk5aApZQHAV/ypvN3eH9upOWsprHrYiAhRdwO5Rn4VFoAywbh7mt XYsJT+obZXzyuuybkCFyoMt28umy7bua0gODiyUttBbm5dCpKheBT4eq8OYuWMvVlZNjsl JWqREGmfO+ApwuW1lJAqGIBjF3vCHBx8uNzsz3/MFAk7HHShm/nG4sGN6MKa80+i6L24Ln eIia+wMkhJdwV89Xy4m3DL9P/Bo2BNPZ6HpL9Ew5F3nkGxwtBzgEPpuDg06pgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=ab001fcdf22d8ea7ffad43f8e7896b73c0fdc3b6 commit ab001fcdf22d8ea7ffad43f8e7896b73c0fdc3b6 Author: Richard Scheffenegger AuthorDate: 2022-02-07 02:27:38 +0000 Commit: Richard Scheffenegger CommitDate: 2022-02-07 02:28:27 +0000 tcp: Apply tcp flags after ECN processing in rack_fast_output() Missed to move the tcp_set_flags() past ECN processing in rack_fast_output() earlier. Reviewed By: rrs, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D34180 --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 459520a4a0bb..8df5ae09574b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -16489,7 +16489,6 @@ again: sb_offset = tp->snd_max - tp->snd_una; th->th_seq = htonl(tp->snd_max); th->th_ack = htonl(tp->rcv_nxt); - tcp_set_flags(th, flags); th->th_win = htons((u_short)(rack->r_ctl.fsb.recwin >> tp->rcv_scale)); if (th->th_win == 0) { tp->t_sndzerowin++; @@ -16552,6 +16551,7 @@ again: ip->ip_tos |= ect; } } + tcp_set_flags(th, flags); m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ #ifdef INET6 if (rack->r_is_v6) {