From nobody Mon Mar 18 16:15:03 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 4Tz0Lc0NMsz5F1mg; Mon, 18 Mar 2024 16:15: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 4Tz0Lb5lW3z4gY1; Mon, 18 Mar 2024 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778503; 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=l/BYiOuLU67P7q5Hnh0Wa6hViuh6+S+3YdnYcTwUiS0=; b=S89IRxNQ0XRIRsNZjWumkyyMpRqJqawMji/KgRN1hbjSH0e6hczp4IqNZQpbZ0QZJ8YjHs V21V6YbaOG/eEp8D6kSFYs3R0vi6zfiSW7YGnzHiVAWmXr/AQTes/Ynybgu4fAeE392APk JnqDJQGXUxIVGKwzT3+m69dddriGy7bbSUn3zwoNFyOR2GpKV2Sy8JH0d+0NxrISqlyXl0 IrlvPsDC8PeGNnlzzhFzOLPQfgJGXjilg8MCK5hM99x2QTUw+IY+1MdpT2nU4j9kzeFwHx W5PJBh2xDdZIQKnHPJodUY7/rgl8O0j1dZzCmGgyTWo6m6xTjUjzUCL7XRnkQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710778503; a=rsa-sha256; cv=none; b=lBywaaP/jhOTCtY6N08HnRSbgh5W5ijmSu9hMFlC1KzFPEdpvEGmHtcBSFtXju+hX8vnxC JNrwoX8KhwZZT4Z+WY0RWJrTIChSl51dg62V+9wEi+abc4lT05MBWz3DILyo39T2beON+V ssQKC4aiNGwKzpwrV4WdZAQwj/i0gaa2Zl9HF8cqq2MF9B2sDp5lPatBbYBeyFF8u+0T56 4Jl8tWRwwmahyEsA0FIb2NaWG+d3op3KDmJEEy14inAjDlk59atcM9pyGSKPZmhsxTZZBa b6/pE/uHyh/j4pXXLqopL5VmMGatIdeHOhmeKUA6wEyGmtEnQBUBVoyUmdtAWw== 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=1710778503; 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=l/BYiOuLU67P7q5Hnh0Wa6hViuh6+S+3YdnYcTwUiS0=; b=JWx/jtpXXDp3S7rJHTd46aAWYe/7ho9InC4leKsAU3KDx9nIHIb0MLNf1YLMYoHduxVmmK J9FWQNzaK7gLWrQKplmnIuNAdjyeHqXfAfegyYxGnpzH2l4sjou3/9EzXuwfJ9eJYlRRLI s/6zZ++dCdwffdCS2F1fCShlM+aH8L9N5Vyx0E1T0guGAcwIQPIvBeoW2gyHEgsFueaemO ouycWiIfRGcOoLHEq+XuIIclnUS7r1Xe6bVVz/4ojcSl3l5PgsMaXei4YfhBLRZmFHZPqu 4acrxrwa5KFmif2GiFQ5KtFiwEpVkFFS9PB2trioV5uA3a2dNaEinbKvKxo8WA== 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 4Tz0Lb5LZ1zW3c; Mon, 18 Mar 2024 16:15:03 +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 42IGF3Ir036155; Mon, 18 Mar 2024 16:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGF3De036152; Mon, 18 Mar 2024 16:15:03 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:15:03 GMT Message-Id: <202403181615.42IGF3De036152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: d45714ade3de - stable/14 - netlink: fix route protocol constant values to match Linux 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d45714ade3de0db24cb313c84674c2a8573f4690 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d45714ade3de0db24cb313c84674c2a8573f4690 commit d45714ade3de0db24cb313c84674c2a8573f4690 Author: Marek Zarychta AuthorDate: 2024-03-11 15:50:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 16:14:45 +0000 netlink: fix route protocol constant values to match Linux Although these particular constants aren't supported, the incorrect values break bird 2.15 operation. PR: 277618 Reported by: Ondrej Zajicek (cherry picked from commit 16f8d8829472dfdf6b3b2bb21d652f0bafefccbc) --- sys/netlink/route/route.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h index 9247a59855bb..1d4149e23d2f 100644 --- a/sys/netlink/route/route.h +++ b/sys/netlink/route/route.h @@ -282,8 +282,8 @@ struct rtvia { NL_RTAX_RTO_MIN = 13, /* not supported */ NL_RTAX_INITRWND = 14, /* not supported */ NL_RTAX_QUICKACK = 15, /* not supported */ - NL_RTAX_CC_ALGO = 15, /* not supported */ - NL_RTAX_FASTOPEN_NO_COOKIE = 16, /* not supported */ + NL_RTAX_CC_ALGO = 16, /* not supported */ + NL_RTAX_FASTOPEN_NO_COOKIE = 17, /* not supported */ __NL_RTAX_MAX }; #define NL_RTAX_MAX (__NL_RTAX_MAX - 1)