From nobody Sat Jun 25 23:07:38 2022 X-Original-To: dev-commits-src-main@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 0D2B9868D12; Sat, 25 Jun 2022 23:07:39 +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 4LVqQL6qyFz4fMv; Sat, 25 Jun 2022 23:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656198459; 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=j8H1Ds8l7qgqPOYmgdcxnIxYyKUpAuYPAgt41+h0QWY=; b=mPx9E5WO1xtaw/vxIHOihlnahYGkGmnvkrEhUr07sxdVp4WEa6+tVwkLr1DczY6cXeCNed Nk26AJkdbQ8+3ovb660D5PNRetZ1ezfNyP0O5ugCzCAkCa56t8Y4+pRiI3xck1f1TdXFD+ ++GCT15aJNZvobzUVTrImFGOGZAyE8HycCRGzbMAYhd51DBF4BrjsuoIMVOA/NUnhNxB9z 5voYdsHgEZ2QycTr1aV9sEV1Hv7QgGNwlTV2O/2S41vq8N7IXLLjyALzKY/EG9mabrQdlC 2ragfNRR/tM2mnnJEPL6udL/N7vP2vX8iRAPia3ztfQsf0HtmKi6C44bkuYUvw== 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 C55125946; Sat, 25 Jun 2022 23:07:38 +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 25PN7ceU031911; Sat, 25 Jun 2022 23:07:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PN7c8c031910; Sat, 25 Jun 2022 23:07:38 GMT (envelope-from git) Date: Sat, 25 Jun 2022 23:07:38 GMT Message-Id: <202206252307.25PN7c8c031910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 0e87bab6b44b - main - routing: fix debug headers added in 6fa8ed43ee0c. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0e87bab6b44b6cc12d25fd46954ee10121ee38fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656198459; 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=j8H1Ds8l7qgqPOYmgdcxnIxYyKUpAuYPAgt41+h0QWY=; b=muWVABdw2Jyb86UxQ5db2fdYd6VWZWM+/c6Iuf1PougGcxOfMHII42vDRuLZ9YxXpxgIYe jzd+FYaZLa/l1GL9SKs0cEbwoywpTL488n+zNBXhn1gyBw4GYUD3AFHkDhy8DrswelI9Kn UO5sC3YvXM3tbAyT7ux8gWJQtoQtBgotrb4pElQ6rVmvNTAgAN3OeFw87ngCE0xvzMUb+S OTm7Gcd3bQhGlm/mwPAGsTANV1vc+JBfdBCndisoJp7BdeDdAhiQ6acYvGqSJBYjYCSLRV 3GL2To1ZeUuakRV4+AssQFFjuvlJKtEchsyTr8O21HL+6atpCvbjjXh+Moe+mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656198459; a=rsa-sha256; cv=none; b=odLOBDaGRQWbbCZrFmGEwZJ+7O7/ajI2SQgfu9FvMNNef33vveEa0JMUxhKUGm/7PxHXaI QGtPjXFmeXdKvOOB6QU8WmoOs8CntHs8ZnpOZ7uu0bIcaCqkYFhULCfvf64XrZcIZi3oo2 oofNHSB/WcNJ5A1GvYwdqK5aoX4W09lxVP2VwteSWHZyfTInp8U6dkuczYuZ3xnd69ELh6 pqZSdKxL5WTurh40pdB1JAlB8PpuHV5zfnBNJaM2SW2nePuQqlk6glfI/U13Um6beDHxDO k1Fl4lcHKZYq/YFNl2ulg/yOyji7xPRLKw4jbsZtV+NntIbKdP3UuCT2XPrvxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=0e87bab6b44b6cc12d25fd46954ee10121ee38fc commit 0e87bab6b44b6cc12d25fd46954ee10121ee38fc Author: Alexander V. Chernikov AuthorDate: 2022-06-25 23:05:25 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-06-25 23:05:25 +0000 routing: fix debug headers added in 6fa8ed43ee0c. - move debug headers out of COMPAT_FREEBSD32 in rtsock.c - remove accidentally-added LOG_ defines from syslog.h MFC after: 2 weeks --- sys/net/route/route_debug.h | 7 ------- sys/net/rtsock.c | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sys/net/route/route_debug.h b/sys/net/route/route_debug.h index ef14da4db81c..b2bb8426a816 100644 --- a/sys/net/route/route_debug.h +++ b/sys/net/route/route_debug.h @@ -80,13 +80,6 @@ * */ - -#define LOG_WARNING 4 /* warning conditions */ -#define LOG_NOTICE 5 /* normal but significant condition */ -#define LOG_INFO 6 /* informational */ -#define LOG_DEBUG 7 /* debug-level messages */ - - #define _output printf #define _DEBUG_PASS_MSG(_l) (DEBUG_VAR_NAME >= (_l)) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 88ff0e1c0d7d..540ee995460d 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include @@ -77,13 +76,14 @@ #endif #include +#define DEBUG_MOD_NAME rtsock +#define DEBUG_MAX_LEVEL LOG_DEBUG +#include + #ifdef COMPAT_FREEBSD32 #include #include -#define DEBUG_MOD_NAME rtsock -#define DEBUG_MAX_LEVEL LOG_DEBUG -#include _DECLARE_DEBUG(LOG_INFO); struct if_msghdr32 {