From nobody Sat Feb 24 20:02:27 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 4ThyTc2YcDz5BVQq; Sat, 24 Feb 2024 20:02:28 +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 4ThyTc1c4qz4Cyj; Sat, 24 Feb 2024 20:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708804948; 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=VfiUabsJvD9uwUIGxIvRl5AaqKpnHtlgTI4JowT74bw=; b=N+/9MLJTAQTqlFRHGzdD+TB31y4RBW0SmmasVwUXY9uxhdP1SByZZm2dg8mSfrM2KRlHr3 HQijA3EeE7UweA384XD04ReoAxBSEo4n/ETubLGePcVxfQV1yQbR6ImBneHDn1mEiNMkbT /70lgL4H67QG3BjMfnxynKM7e6VKm0uTXcVrwipIVgG6aee+dsvvqpr6mf1xxNoRgYKG/m LieguT31wiNV2FJ1r/GhHfhrnivRQ3fOdwr+vrbpClMntGcsDks8D2QX5Vn7rv1m6IsSTe SY7TRuTQvwGE9XxEu8Ak/XvWzziZLVOoYzMcYhvWWVdgWV9H70UXM5IVIxvg1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708804948; a=rsa-sha256; cv=none; b=KVQJtJUQihvRTc0/ReJi2zFbks+hxjFOkkIoabdnNgK31PaYX/TnLfFxcVG+wlnvVZJVKB w8s0e2BR2CQtPwr22GvURclk/H/H1zfXi3yJJp4FGxrHVnieOSKHygR2dFveswbSjCwKfP +YvaEZJFN1Iqsip2h/jO+umRfzMyCdkgYPcB7vtiRCTkjNT77S2aNYqiXk8e4wiScSoime CMIBCN0Nl7XrUd6oHHBjJiAq0gNvdgSskI8/l9RgRWr3mOVj2Z8VUo+sYQCuPE8GBkFbGR /TxoA5sJV7Xr8ZCfgB8ivwup4L2gDFLBPRmSoKEh8zFq9SwRhcMB+l5iPQkoLw== 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=1708804948; 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=VfiUabsJvD9uwUIGxIvRl5AaqKpnHtlgTI4JowT74bw=; b=w8BMEtJrtTJjmPYZcR3KhIZlPnZmCTBW1LigiCbqfJcHI6wvISyC6h3EjQWGZHGxjF2GHo aJn057/TGXHeMFhhkUW9NTcmoJg1MwYgljKggjPAm6pkZ9p1x3aPKpt2F6lyCcsufijvBn fjLGGXWmT7XVUQjAbC93QWgVDLYciqogE9iP3Wu6BaTuDauMw5uylYJhHIa+O0VOeKDLqZ zRcaatK7H9+U6Dpxv+ku9fv/MkJFwinAKNW72TCC1C4aXCp4TdjCClkZMmzZiKrS35JF1p 2Z8vi9qXWdOSic9+7H8vx6DaeMqFFx07XLUjsietZ0yxR2b0X3bSi6HMquHk7Q== 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 4ThyTc0gSdz1CvQ; Sat, 24 Feb 2024 20:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OK2Rv2085092; Sat, 24 Feb 2024 20:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OK2Rs0085089; Sat, 24 Feb 2024 20:02:27 GMT (envelope-from git) Date: Sat, 24 Feb 2024 20:02:27 GMT Message-Id: <202402242002.41OK2Rs0085089@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: 5e248c23d995 - main - tcp: retain some CC signals outside of kernel scope 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: 5e248c23d995a059d24f4784d5a256cddd42e557 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=5e248c23d995a059d24f4784d5a256cddd42e557 commit 5e248c23d995a059d24f4784d5a256cddd42e557 Author: Richard Scheffenegger AuthorDate: 2024-02-24 20:01:54 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-24 20:01:54 +0000 tcp: retain some CC signals outside of kernel scope Summary: fix build error after f74352fbcf15341accaf5a92240871f98323215d Reviewers: #transport! Subscribers: imp, melifaro, glebius Differential Revision: https://reviews.freebsd.org/D44066 --- sys/netinet/cc/cc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/cc/cc.h b/sys/netinet/cc/cc.h index 5b2cb58a24a0..aac0825e5fe1 100644 --- a/sys/netinet/cc/cc.h +++ b/sys/netinet/cc/cc.h @@ -121,12 +121,15 @@ struct cc_var { #define CCF_HYSTART_CAN_SH_CWND 0x0800 /* Can hystart when going CSS -> CA slam the cwnd */ #define CCF_HYSTART_CONS_SSTH 0x1000 /* Should hystart use the more conservative ssthresh */ +#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ typedef enum { +#if defined(_KERNEL) || defined(_WANT_TCPCB) /* ACK types passed to the ack_received() hook. */ CC_ACK = 0x0001, /* Regular in sequence ACK. */ CC_DUPACK = 0x0002, /* Duplicate ACK. */ CC_PARTIALACK = 0x0004, /* Not yet. */ CC_SACK = 0x0008, /* Not yet. */ +#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ /* Congestion signal types passed to the cong_signal() hook. */ CC_ECN = 0x0100, /* ECN marked packet received. */ CC_RTO = 0x0200, /* RTO fired. */ @@ -138,7 +141,6 @@ typedef enum { */ CC_SIGPRIVMASK = 0xFF000000 /* Mask to check if sig is private. */ } ccsignal_t; -#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ #ifdef _KERNEL /*