From nobody Fri Jan 13 21:24:46 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 4NtvZQ6XRFz2qkkH; Fri, 13 Jan 2023 21:24:46 +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 4NtvZQ539Nz40JQ; Fri, 13 Jan 2023 21:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645086; 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=4W2o/uDic/hECmTIMbG7fu+ZHSA9OoN7mr9uljaafh0=; b=X7xGzA0S9Yc11xr13DYwtrbOP0JAPOUHVVD2cLX13S3CPZelJW3YzUIg2fhrGSBszQ1xTB YWo7Cl4zCbYab7BnsN5ZI/cRJ+wYBrrq6Q1tyIkf3LJBBWtV4h9TtaB6nCGsSQXORlXEsE 6o/Q8Pr9xEd8Qff2U8UUfKwYo3RcrYI+OOiyelm2wXxfwcBOFWzHOnyTMyLna2hYVGO1ks MN1IUCQ4tkZiwqDwqjAO3X13ALLLx/ba33CybARF7+PLwr6k+3j0Fj4hVpkGH8BjPM77sR NsnkL3wUdkQZCcXfiHJAZ+Hg7n1rL+2RKSOAEMlmUYV1BUZ3eN/24XJpqXzAOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645086; 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=4W2o/uDic/hECmTIMbG7fu+ZHSA9OoN7mr9uljaafh0=; b=KAsd+Cy0PaPFGfn5/AMGcM+MnmgIUTP6Wyw2UOCIFxTuBD/MlfNZj0ktiKNJnuh9aL0FF9 PyJB9YWq44yraImXXPh1w2hyFiB6Epb1UddJ1TL/Jdn3OBa2Pux0aoFLn7icRPenCQYIbH ZNqUXifpPKIcLnOnWVYrw30PO6qs0GvlcljPhRL/tdr7IULMuQGfVdC4zB1h+kt3j1vym2 BeQjgNMIwY0Eg5bgQ4ISj/PCoByvWtSWSPFWo91nwIwWV7HbF4fTOevjG1GQyq+mFTA5/y 7f5hXu2xo/AbeNAMt6n1CEcg7tms5x/ItFyHZzPkNWFbCCi3ARIlQsjXA2RMKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645086; a=rsa-sha256; cv=none; b=Anltzj+QtpY0HxfkpLH73P1dncydkyS4w4ueWqqyUoMjfvDy36rlnAftl9aeQyULU0JuYT W+XdF7miAYCMF+cS4gVEJOhDBOY4hT0nw4t8qXPkQpmwHuVv8wwOtMKSTB+3j+K8OZDIvb zp1ooDRgkpQEg11g54NC5PgWkUZPl7+mcXPehcSsFg7/Qy0rx9FIec5PJ9kNZaqbsMAgGt hAJPQALs5YIXtnFCKjWnQk8we2+d4+oq2aEbvHPlvGFbKjUGCR+mPZa2MP/OaoV+rsc8lF Am3w971R09SB2TooYOEaDa7qNdc+5cBEU0VoIGVP2ZJoA3sh9dnybYQQ+bhauA== 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 4NtvZQ3f7czMVs; Fri, 13 Jan 2023 21:24:46 +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 30DLOkS0040653; Fri, 13 Jan 2023 21:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLOkIU040652; Fri, 13 Jan 2023 21:24:46 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:24:46 GMT Message-Id: <202301132124.30DLOkIU040652@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: f7db1d569890 - stable/13 - routing: fix debug headers added in 6fa8ed43ee0c. 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: f7db1d5698904c114fd0e35eb3fa07bb8117c031 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=f7db1d5698904c114fd0e35eb3fa07bb8117c031 commit f7db1d5698904c114fd0e35eb3fa07bb8117c031 Author: Alexander V. Chernikov AuthorDate: 2022-06-25 23:05:25 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18: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 (cherry picked from commit 0e87bab6b44b6cc12d25fd46954ee10121ee38fc) --- sys/net/route/route_debug.h | 7 ------- sys/net/rtsock.c | 7 ++++--- 2 files changed, 4 insertions(+), 10 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 5d9b4b7fa9f7..5011ab37030e 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -76,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 {