From nobody Thu Jan 11 14:32:27 2024 X-Original-To: dev-commits-src-branches@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 4T9nF81S2Sz567Wk; Thu, 11 Jan 2024 14:32: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 4T9nF80gkfz4SVH; Thu, 11 Jan 2024 14:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983548; 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=sLSufdqS0o2lAIzpbrBPliJ3RBMN8Hqf/bZm9n6NrA0=; b=C8rymOKMTSkFXOy8oXVJ4ZQpnavB9rrZpbGwqWEpV3Fnp/D05/1rBjKhsCkGb5Rzta2EWm W2nePgeX5+0izR6TAvLMBRRiUorc9+hPE/5y8GkRPB19VvS19QUv5YtTtyUnHbMUxzNz2B CIzsDmjES6MxII3yCpRDQ5ivDqlDH82RZtLpmNEwq+y2+som0u7Bfm5Hjpmfc5LAbgTwcw LWCxgac577Olv/D70YBFILYblcYOnRjuCouxK7gg8e1HxQ7ogNTR7swuUEXCYguPj4Vjs6 3vYt0KMabmaiqu8iBaUGUMrKUb4+af/3W6ZdpDBp0LAk9Ky4Iaj6DCb1RnsXjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983548; 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=sLSufdqS0o2lAIzpbrBPliJ3RBMN8Hqf/bZm9n6NrA0=; b=MvdCa1kdjMvrgL7oHlkIuzXpg6tGzXAVxiMPUWJDooZ6m3mSOtGWNe9qYlpaQYBZZyCJ6f 2/khu6lLMvRmCDvXl2QHfx0At21U7hPifUFlvBHJFZzdI6K/GUNWqNthyqp5HsbyRqV9fF IUZoTEFoczytS4sY0SWwQcnh5kWzOc6QzMGJYiX76AGi5CWyQWTZiS8uAsJymuEsLGQ3Jj 2edBOMVmmRTKQjwslNkBiIPpO+Unb9FiZDY3CtCwaszdmovJAxtkhl/Rj+s9bk2Fq05JbR 7r/3V/n1gFthZ0gbmSqoglY3SHeR45k5ZgPwj5BMaZYv27IGjV7IdVamft1K/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704983548; a=rsa-sha256; cv=none; b=fRShDvXnkOFaJxX5ezg9cPHb+gsGKURjc4vJ5cBvv6L+sEeet42nQTVIwp9MLOp9v9qEu1 Po26HRdh97CVcfKHaNjGhd5EQcbIVhkCuSaxqf4MNpJUPAqiHIH5+Xmchfv1B4+WEQMiwb aEmRCsPE47+BtHUb5G0+BMEec42yVXlSezwIJY1UMaptlOwctxvCMzjhHJF2WV2WL5gN/G rl+ooQcm0zrA1YoHTUDsXuR0tecj2uLW6i16EykwXuzOnNumOQvN8xQ85c/UKS1Z3K9O3L UrD++c7sD8yzRJOlWE3DenCy5WKJHYZCYCe7omTmS4rdCBAnCbsGLU4vYrqGEA== 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 4T9nF76sDwzMX8; Thu, 11 Jan 2024 14:32:27 +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 40BEWRNf023452; Thu, 11 Jan 2024 14:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BEWRgi023441; Thu, 11 Jan 2024 14:32:27 GMT (envelope-from git) Date: Thu, 11 Jan 2024 14:32:27 GMT Message-Id: <202401111432.40BEWRgi023441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d14bf9de60a8 - stable/14 - netinet: Define IPv6 ECN mask List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d14bf9de60a879dd9fccfbe977b467e87c0d357d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d14bf9de60a879dd9fccfbe977b467e87c0d357d commit d14bf9de60a879dd9fccfbe977b467e87c0d357d Author: Jose Luis Duran AuthorDate: 2023-10-28 02:50:18 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 14:18:12 +0000 netinet: Define IPv6 ECN mask Define a mask for the code point used for ECN in the Traffic Class field (2 bits) of an IPv6 header. BE: 0 0 3 0 0 0 0 0 Bit: 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |Version| Traffic Class | Flow Label | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ... | For BE (Big Endian), or network-byte order, this corresponds to 0x00300000. For Little Endian, it corresponds to 0x00003000. Reviewed by: imp, markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/879 (cherry picked from commit b0e13f785b336670bdf39b83a78435b00d00f43c) --- sys/netinet/ip6.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index 8c3459339bbc..7b85fd5b4ddd 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -97,10 +97,12 @@ struct ip6_hdr { #if BYTE_ORDER == BIG_ENDIAN #define IPV6_FLOWINFO_MASK 0x0fffffff /* flow info (28 bits) */ #define IPV6_FLOWLABEL_MASK 0x000fffff /* flow label (20 bits) */ +#define IPV6_ECN_MASK 0x00300000 /* ECN code point (2 bits) */ #else #if BYTE_ORDER == LITTLE_ENDIAN #define IPV6_FLOWINFO_MASK 0xffffff0f /* flow info (28 bits) */ #define IPV6_FLOWLABEL_MASK 0xffff0f00 /* flow label (20 bits) */ +#define IPV6_ECN_MASK 0x00003000 /* ECN code point (2 bits) */ #endif /* LITTLE_ENDIAN */ #endif #define IPV6_FLOWLABEL_LEN 20