From nobody Fri Jan 13 21:25:25 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 4NtvbB6Mc0z2ql9j; Fri, 13 Jan 2023 21:25:26 +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 4NtvbB2wQrz42d9; Fri, 13 Jan 2023 21:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645126; 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=QpJYJCS3CjMeDxJRdK+JHkTGgtTDuVPGxRUTFYMOU0E=; b=mMM8JsJWZPVkaqrVBK+Jw1JXPdXOgziq3Ej3TLJBjQlmEfw9/aXz/GeVcC49yQVRT6orsd kbqFY8sXBmJ7rR054JDM7K4GOgqmjM3OiXwNp44+pHAGD6YO68H5vZyewiu93JqDv18k35 k8Bz+lwqwravt33YWQAO7NP2EE4kULx7K53QQQWmN/3tX7OwTZWXu2mFZ3NF49Izxu7erp kD/wjGa7zXC3UwdC7L7f/xp1Y82+UGtc3Bhm9Cm05tPOeVJdGIZSNPsneCHZAANmcydQaQ yPK2MK5T5QtZVlkEbeuNz1SpWtCPa+sky5DNz1w9OBFyWWry5t2MDJ6QXII3vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645126; 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=QpJYJCS3CjMeDxJRdK+JHkTGgtTDuVPGxRUTFYMOU0E=; b=rViB6CD2OS3V3i/KAXLMYC1jPKzSROO/6aNK1nvmd6Pqo9b9bSkpWTSo5IbruRKp9suFe4 AwQwVCP51JuDxakGFCrjGKhIsCse7tTVrQ5sRxK4ZMTCALEShuatk0QH9G0pVRMxu1Jp9T +bydHyYak56uiSiqaBK7Pfd7BJyG23CZo2n8wgdfVs+7S8zjRsy75Yzp33RQ9CgeL9S5ev 2PfNZh6gx5h9NjQdtXOZMAkozR1qbiVE0OMc4sfwzDn6I1npgvFSJBLBpeOAuXOsMCQxBD UKvoPPv/ty9J7SoQJutsmpbEOreJtsXYgon6H1RFt9ul+ggvu0H9RPXh9jOVFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645126; a=rsa-sha256; cv=none; b=Ye52NPDvQkL4bjJhIlLYRrhF7WFt02eA3/gFDzrdZ0lDqeg5AF02/8nAynIpTDPepDFRuK oadJYw1Y9HtOhjYuY5o3qg7jdChYFAJl+VuzneRDCf9FLrskukCs/NrDeATDvgm63QVUix JEt0KkFWSNhr/XOhqMaJGUeJ5O8xP7C0v/brqDNP8dwU5v/Ci4CmV0G8oBSjD5RZkU8EMo mjvOD8yNMQr6z07IXPPCSxu5ZCfkgEgvnHX2M0PaV4UHQlsGcNS4xPyYNGoQme9b/TYh61 S9AFLUVx6ZZ9Kt3h3boDrlTiZjX2K48dCV4fLy05O/AmOxzzKCDlVKJ4pgs4hg== 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 4NtvbB066PzMrX; Fri, 13 Jan 2023 21:25:26 +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 30DLPPG7041837; Fri, 13 Jan 2023 21:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLPPkN041836; Fri, 13 Jan 2023 21:25:25 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:25:25 GMT Message-Id: <202301132125.30DLPPkN041836@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: cd1618ad949a - stable/13 - routing: fix debug headers added in 6fa8ed43ee0c #2. 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: cd1618ad949aa38eead79d628cc89f4308c96b38 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=cd1618ad949aa38eead79d628cc89f4308c96b38 commit cd1618ad949aa38eead79d628cc89f4308c96b38 Author: Alexander V. Chernikov AuthorDate: 2022-06-26 07:26:53 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:24:10 +0000 routing: fix debug headers added in 6fa8ed43ee0c #2. Move debug declaration out of COMPAT_FREEBSD32 in rtsock.c MFC after: 2 weeks (cherry picked from commit 33a0803f000fc52a50465a65d3e8b64168557ecf) --- sys/net/rtsock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 256c4a96af73..85f1c2472742 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -79,13 +79,12 @@ #define DEBUG_MOD_NAME rtsock #define DEBUG_MAX_LEVEL LOG_DEBUG #include +_DECLARE_DEBUG(LOG_INFO); #ifdef COMPAT_FREEBSD32 #include #include -_DECLARE_DEBUG(LOG_INFO); - struct if_msghdr32 { uint16_t ifm_msglen; uint8_t ifm_version;