From nobody Sat Aug 03 19:55:06 2024 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 4Wbthp1tc8z5Sxt5; Sat, 03 Aug 2024 19:55:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wbthp1BCpz3wnd; Sat, 3 Aug 2024 19:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722714906; 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=yFUoZbctlPWRVpF8bAE2epGeRdFhReRWrix5mVBqScw=; b=LF64Y0kQaL8Pjiph0OFPakT3uFrNuuUJflLYY1kZ5ozhD8ZxVcO2JhVxYqRkzcpi/yj4n8 F3bacLR6X3i5Bdv8kxjHg+XJhUaolE1gbO8V5wkcmuF4wz5YO+IDqrCZ+jjY82fnrTCfoE Txn/lzda+vMdJYWg5MtxgCLGSojQdlZgibo3zs7no6WrIRhydsHW2lqBBWs9L2raGb/W7c MM0sM6MB4HeObl+nnKiLYlt3rOuNhvepWrr+54LtC1+KVQKGlS1VfgqXnrWexmq0HkWMw/ d9r50dLN/5+Eeim89rIR7JAsJsHnH/3rCyIGHCtGXGNfgWBUyA5ke3u5k5UhvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722714906; a=rsa-sha256; cv=none; b=lLY9HQQmUMR1MOpe0i8E762y/FLFaZUYMak4otUvCFW/fzeqgvxYBVx9V95mt/aMyJ6HlC IWF91GZZPuFDMlBP4l3hw57OsdKuyKF7WZ2zlLF1FY3FxIwRZTF8+Np+DQRgWJdC1vRzRD +VcnEBnbFrUUEXJ866mi2QeA7SfpmsjjOaGOmx///kY4PSSxkHz5zeXlVpqyqlQoNFSYd5 jzVjAfBykMI1mHvG9iEJ0yOCBHg6+TWf/BZ5w4PY0x8iFK+4N6fVG2sIQYZ8eNhWIfVES5 yiPBLRpfqcW+flZbIGYKVvkuGZ72HkrOPZLqrx1eBtNETq2/O5Au+4iBYIa7vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722714906; 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=yFUoZbctlPWRVpF8bAE2epGeRdFhReRWrix5mVBqScw=; b=baSWqGOZEecKq7rjfWbaTqBLJ5vuQjUG6VPaaJCtqDWZey6B6YiG2zxKhncDvrnoqNXdcK hY27zSo0hoiXQLklg/N4spwUBH8ir5NgIKbnlvyVc1mNO68PYjeYXeT8lcRjsGRc6d1SIE 95Z55fAmg7zIBgg4STuich5+Qr0QwQ95jcOtyPj7ALd8j87lD8tWaX1fb/I+P9U0SbokCo 6a6BUdlHR8McqMmddrHyBEglBbAqOBrSPzEJcXYfm7UZOFRGnT9FLOo2FspoB4Oc07nu5/ NRoZiKDXJFiQmyWefilJzuwjJVmac6LT5DjOiSw5ID6rIIQRB6gW3ZRBYiHZOA== 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 4Wbthp0TQQzQ1V; Sat, 3 Aug 2024 19:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 473Jt6Xe071291; Sat, 3 Aug 2024 19:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473Jt69J071288; Sat, 3 Aug 2024 19:55:06 GMT (envelope-from git) Date: Sat, 3 Aug 2024 19:55:06 GMT Message-Id: <202408031955.473Jt69J071288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 52eacec95d54 - main - tcp: fix t_flags2 collision 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52eacec95d54205962a3d6902e18e41fce8b4e79 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=52eacec95d54205962a3d6902e18e41fce8b4e79 commit 52eacec95d54205962a3d6902e18e41fce8b4e79 Author: Michael Tuexen AuthorDate: 2024-08-03 19:49:18 +0000 Commit: Michael Tuexen CommitDate: 2024-08-03 19:49:18 +0000 tcp: fix t_flags2 collision Fix the collision of TF2_IPSEC_TSO and TF2_NO_ISS_CHECK Fixes: 646c28ea80cb ("tcp: improve SEG.ACK validation") MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/netinet/tcp_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index cc982e321709..8ff015b90f89 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -854,7 +854,7 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF2_CANNOT_DO_ECN 0x00080000 /* The stack does not do ECN */ #define TF2_PROC_SACK_PROHIBIT 0x00100000 /* Due to small MSS size do not process sack's */ #define TF2_IPSEC_TSO 0x00200000 /* IPSEC + TSO supported */ -#define TF2_NO_ISS_CHECK 0x00200000 /* Don't check SEG.ACK against ISS */ +#define TF2_NO_ISS_CHECK 0x00400000 /* Don't check SEG.ACK against ISS */ /* * Structure to hold TCP options that are only used during segment