From nobody Fri Mar 7 09:55:22 2025 X-Original-To: dev-commits-src-all@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 4Z8M971QmFz2tr2p; Fri, 07 Mar 2025 09:55:23 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8M962qJrz3wmD; Fri, 07 Mar 2025 09:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741341322; 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=QawxurF9A25bUS2iirk46V1OXMs/mnUMsWp7UPWNn2c=; b=a3I28RKkKcSaE25sxLOKzPHd0AhjpWOGjKwABJmleGf8c4444fFZaJbXEQl6mraZnLqwl2 BT0h4D1H1djFhjR4/TPoBBQwbH3JqgcA+nfbeUdra/TF2813DagtDVoat++oDnruOklM3M iHo6P1Q8DZ/rwlctSVzVu2dY7GDCjMYyo9Eu93yykIm5EOL6+9vvylrxrNJiW28JEpcIuT NurGU+hXj78e2sI7dL/a+HbUHDZMo+ofvFmQjjk9BXeBPho7EGO3fczMOmG/wP6FbAO5qG Fhh2F+Ivlbc6jXoy/BZWBjDLoiCk2r4V6eDJ9lhiC7VzHyTUTf2tmmQHy5fajw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741341322; a=rsa-sha256; cv=none; b=gSUCBE9O/56yHJCjFYGm9XeASduaW4n8VZHGWPYaVozCRtdi4CJKQIsvki5+w6JQ+RCtjC QoMs9dkKwWLoY7ZZJ/VLNUQgZHz+MJKZFQ/xDe5PRT5gFV/UNBVYR8wo2yjQ+3eseHJ5WJ tMpMKSKDIegcsQCK8bckpjPTXnQtpfsfcEnYpzYMPLV9q3UWV63MZRbUk3NIkcsAFfdvHe 3I7ukqJ7LH2JElG4Y4ZH482DJ9pOHrUplhS1MMO3qTVZVj95ViUQxuaqkBGeLrDp/eNlql 1BUrTVcdkYvvmUVjGvbzgYELqJtamXF7bjS99M36rPat2/vGEUZ2F16uMYxFog== 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=1741341322; 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=QawxurF9A25bUS2iirk46V1OXMs/mnUMsWp7UPWNn2c=; b=IdMJcosUwosc+lXaTd4j3ZukhjT2NIEO9hdec8TenO1s3Pcp4IrUqc6aP65lMqxQ8yv26+ GePpGBfEMLiWk14lvp6rbl7O3Ae2ng9Kiy2fDVS8rW2LB+rsOg4iKRrR0/AWqojB5pr0jz DFDYLMnhtgOdTfReR5VgBchA3iXa1sSr5ptKxoe8a9FDf1Q8WUtECP1V09Ghs2OKLjnXQ7 jL5ObuCq89Fh/3BDqTk2qIDKch8tFItFiewEFA2+FkaCkiD10cRLtrDPg6subSfKc0QzTg /88RZvh/OK1ETbl/0xEzsluBbxZXWZjlxZceYM4HXoW+piD2mbeK5xfbmNMFmw== 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 4Z8M962JlKzXYR; Fri, 07 Mar 2025 09:55:22 +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 5279tMO7084763; Fri, 7 Mar 2025 09:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5279tMkX084760; Fri, 7 Mar 2025 09:55:22 GMT (envelope-from git) Date: Fri, 7 Mar 2025 09:55:22 GMT Message-Id: <202503070955.5279tMkX084760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 836c8dad4544 - stable/14 - routing: set net.route.multipath=0 when kernel doesn't have ROUTE_MPATH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 836c8dad4544da568d50918a575ec309315300e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=836c8dad4544da568d50918a575ec309315300e7 commit 836c8dad4544da568d50918a575ec309315300e7 Author: Andrey V. Elsukov AuthorDate: 2025-02-28 14:05:47 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-07 09:54:05 +0000 routing: set net.route.multipath=0 when kernel doesn't have ROUTE_MPATH (cherry picked from commit f2644d64b40f611fd4d4f66069ad8d6cf33f69df) --- sys/net/route/route_ctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index d7756f2a0eb6..e5ddd7782e1e 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -109,10 +109,11 @@ SYSCTL_DECL(_net_route); #define V_rib_route_multipath VNET(rib_route_multipath) #ifdef ROUTE_MPATH #define _MP_FLAGS CTLFLAG_RW +VNET_DEFINE(u_int, rib_route_multipath) = 1; #else #define _MP_FLAGS CTLFLAG_RD +VNET_DEFINE(u_int, rib_route_multipath) = 0; #endif -VNET_DEFINE(u_int, rib_route_multipath) = 1; SYSCTL_UINT(_net_route, OID_AUTO, multipath, _MP_FLAGS | CTLFLAG_VNET, &VNET_NAME(rib_route_multipath), 0, "Enable route multipath"); #undef _MP_FLAGS