From nobody Fri Jan 13 21:25:52 2023 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 4Ntvbj54c4z2ql6t; Fri, 13 Jan 2023 21:25:53 +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 4Ntvbj2w0yz447w; Fri, 13 Jan 2023 21:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645153; 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=TcJ6uBYsveQD/ZcN2J7Y9yHxqC2tj1aO0MPu6XqRYAw=; b=NzdLSay4UoXFJrA++CIDGuwh5sT63l6rCC1Ok0n2yQ7UEAeudE/IJln7bZgbPHqZotxkvN yJEkMlTdMTyKb5C0jXM84TXUZEdQllNniiatehu5IDt+BZCHwC07vg/jVtz0PQViEW66ho zYI+WZHhYCBmEmuc7pWmYDvjoMsjAHrpcSxrr3XQQednzujIbVm09RbmDaLNhRUwEfwb71 pFLl9RziNphlzhYFU6M9vGyilPtOTulNwlLv501RfbQhQrgVWsFvA/qU1734QDluO89BSR OC2qI0/Ql6BhmjOU3zCtjA5yd8bM4svZyyz0b+JE1sKIvU2zma20O9+3JnSwew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645153; 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=TcJ6uBYsveQD/ZcN2J7Y9yHxqC2tj1aO0MPu6XqRYAw=; b=cvdY4jzAcaFyaZ+BWJ6rRYwjs/GyhcKfM2+aXjTE5h2rFjRmeAZQjyUaKAhrObnT9G3QxW FYcrh/+WFJi59HgVh8NFv2xONhpR1vaa+8UMTW9XzDP70oQ0A+7zYUgPN+TIYubOVWOrbd b/F0nUjAoDxoGJ1+d21zFLptuyXFOT2pG11lAagDSn/2vHLwD5T21sHkRcPgyx9SL7vcwW hjLEWjHn5cUP+WpwIe97Kv0FU2BbA/O25tE8LLIfCROJwxMZ2I0Fx9vNLq5rDgHraYfpbH xaOiJm2tiH8ZcwfqoI+aYQoNRe659dTTgZSQpAkx7Yp1k/xcDXWlND3ONrLxsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645153; a=rsa-sha256; cv=none; b=hH4Lo6DJNrSX3Q6lb9WHez4WhJCdwM71PS2c6BIk4HwyqfaDksis6RLbINhzNzWfxOa8cZ n4nEjXm4u1V4lZm6wwXExiWVJZbLLPljuKkMAAniHZ81YjeIQVnkZMTJCXhw6XKgWe7qxo QdTjKFzpTNnll/1jUFcrejrL1TpdX3e8TeWgyFA6UbJltMGOSg7wyOrx1IEJi1aX83numM P6BfbMsHUmA+7tluEPWnhh9HqLA2vuAL+Ml1U4nvIHbBZKL3sYOFSREf/gx/ivEjE+M3Wm YDVEf4hd5o5WhEkItxVr0aclGSETUPrtnOXhcvZC06REXCa6b0cwW8BJ0izzgQ== 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 4Ntvbj07ZFzNGd; Fri, 13 Jan 2023 21:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30DLPqQD042464; Fri, 13 Jan 2023 21:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLPqTo042463; Fri, 13 Jan 2023 21:25:52 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:25:52 GMT Message-Id: <202301132125.30DLPqTo042463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 6363fd571bd5 - stable/13 - routing: allow logging framework to be used outside of the subsystem 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6363fd571bd5e9dfec987e65cdf8c929f54a15b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=6363fd571bd5e9dfec987e65cdf8c929f54a15b9 commit 6363fd571bd5e9dfec987e65cdf8c929f54a15b9 Author: Alexander V. Chernikov AuthorDate: 2022-09-05 10:44:27 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:24:12 +0000 routing: allow logging framework to be used outside of the subsystem MFC after: 2 weeks (cherry picked from commit 4bccbf03d81b2bafb93c1674eaa2f70e7226a25a) --- sys/net/route/route_debug.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/net/route/route_debug.h b/sys/net/route/route_debug.h index b7c8c79f7ffa..5be39a53076e 100644 --- a/sys/net/route/route_debug.h +++ b/sys/net/route/route_debug.h @@ -35,10 +35,14 @@ #include #include - /* DEBUG logic */ #if defined(DEBUG_MOD_NAME) && defined(DEBUG_MAX_LEVEL) +#ifndef _DEBUG_SYSCTL_OID +#define _DEBUG_SYSCTL_OID _net_route_debug +SYSCTL_DECL(_net_route_debug); +#endif + #define DEBUG_VAR_NAME _DEBUG_VAR_NAME(DEBUG_MOD_NAME) #define _DEBUG_VAR_NAME(a) _DEBUG_VAR_NAME_INDIRECT(a) #define _DEBUG_VAR_NAME_INDIRECT(prefix) prefix##_debug_level @@ -48,9 +52,8 @@ #define __DEBUG_PREFIX_NAME(n) #n #define _DECLARE_DEBUG(_default_level) \ - SYSCTL_DECL(_net_route_debug); \ static int DEBUG_VAR_NAME = _default_level; \ - SYSCTL_INT(_net_route_debug, OID_AUTO, DEBUG_VAR_NAME, \ + SYSCTL_INT(_DEBUG_SYSCTL_OID, OID_AUTO, DEBUG_VAR_NAME, \ CTLFLAG_RW | CTLFLAG_RWTUN, \ &(DEBUG_VAR_NAME), 0, "debuglevel")