git: f7db1d569890 - stable/13 - routing: fix debug headers added in 6fa8ed43ee0c.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 13 Jan 2023 21:24:46 UTC
The branch stable/13 has been updated by melifaro:
URL: https://cgit.FreeBSD.org/src/commit/?id=f7db1d5698904c114fd0e35eb3fa07bb8117c031
commit f7db1d5698904c114fd0e35eb3fa07bb8117c031
Author: Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2022-06-25 23:05:25 +0000
Commit: Alexander V. Chernikov <melifaro@FreeBSD.org>
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 <net/route/nhop.h>
+#define DEBUG_MOD_NAME rtsock
+#define DEBUG_MAX_LEVEL LOG_DEBUG
+#include <net/route/route_debug.h>
+
#ifdef COMPAT_FREEBSD32
#include <sys/mount.h>
#include <compat/freebsd32/freebsd32.h>
-#define DEBUG_MOD_NAME rtsock
-#define DEBUG_MAX_LEVEL LOG_DEBUG
-#include <net/route/route_debug.h>
_DECLARE_DEBUG(LOG_INFO);
struct if_msghdr32 {