From nobody Sat Feb 24 20:38: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 4ThzGn1HL2z5BYV4; Sat, 24 Feb 2024 20:38:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThzGm65SMz4LJV; Sat, 24 Feb 2024 20:38:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708807088; 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: in-reply-to:in-reply-to:references:references; bh=BhN15oDwgptoHHEtm/AdNov2cmsRSBh9dhRvnP8INfg=; b=jzloIYBF2Wi9RRy3kh2SoJYTyH/6FFyOGqqsIH/Ao5TIsE73gqjrdJNKi6rlOTdWfOLroX fZ3rrAZI4IhzxpQOKDdAJZkgQGOzweEvwyW5X6gjDnachx6/ApEpL9Q1hUuUeyVt5y+of6 u9EC2WPDlqlsU2Hqwv89OVAQlI691Gk8NlIY++TSQU/UFq+8ExMJJ2cV7pObYE9vJIDfsI NMMA3dGiPGiCzbZxPdew4utLzdZjR3aTHa7JzJDOtfnqzKohXy76pbOzNYKWQPWcOvwVHA VFJ1Kzc5x2Fuc+RSUyty/9tP1/qAbShYM4bh0Z7zbeNexukIIkNmCY1tGU953Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708807088; a=rsa-sha256; cv=none; b=hfQMnC8Ibszm/GFhY9LBAQ6y3M1ZmRst6cgpxq4A3+DB/vWpkyeelu5+FBW39joJr4sDYH yP1hnn+tvB20E10vwYn1MYpHse34e1slpnhjj+NSthuJJqctl2xm361a3ttVG07YZvk0G3 ZXpchTZrhetH3VP4bPi1ojlSwLv8oYQBcZUeOx+Sdn9wEIGR1c/75bz+hA736srQeFaIYQ B4dJJ8aqvjraAuNgHa6IfaYa3S197/1eF9xCNueG5kY7MTS0SpVUm7r3CSPZG2/iZVV9ou 4wYfwJOKPPNBmqs5a4aREXXLgt7G92m6Mw8ksawCgcPjIHDU86xL7HY15yQ57A== 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=1708807088; 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: in-reply-to:in-reply-to:references:references; bh=BhN15oDwgptoHHEtm/AdNov2cmsRSBh9dhRvnP8INfg=; b=IaJrpxp2Kt0s/uJaA/mSUfhdnCekuJRa2uCpk53noSyVL6okjjTn3HTC1CrhJhfiFneiVQ mE1nDH/cHZOUl9iFXsKIRlmOElkdcE4VDn+CbI2xXAtD0YzgFg1gA140fMQJCUuW+uyeu5 ntqcBK7hTCs9Vx4n1+oyRWjSmqVBLJy9CaEP9rc0xbeYCiZjCwUvXGnyFHQA+sDuGlFTef Yl4lAeFuByM8tkACCL4E1RQYKmltvTVe6QyavEDrR8/mSteDSwwwyGL2weTersFunmMIMg 1h94u87j8DFzrzlUqI1GcUdHK82uFxm1UYZRON9ux1sO8weY8vEhSTzLjJfH1w== Received: from [IPV6:2601:644:937f:4c50:9110:97a:5df4:795c] (unknown [IPv6:2601:644:937f:4c50:9110:97a:5df4:795c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ThzGm20Qfz1Zjl; Sat, 24 Feb 2024 20:38:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <88451bc6-fb9a-42d0-9d6f-ba83330aa6b9@FreeBSD.org> Date: Sat, 24 Feb 2024 12:38:06 -0800 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 5e248c23d995 - main - tcp: retain some CC signals outside of kernel scope Content-Language: en-US To: Richard Scheffenegger , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202402242002.41OK2Rs0085089@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202402242002.41OK2Rs0085089@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/24/24 12:02 PM, Richard Scheffenegger wrote: > 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) */ Is there a good reason to not just expose all of the enum values always? -- John Baldwin