git: 0e87bab6b44b - main - routing: fix debug headers added in 6fa8ed43ee0c.

The branch main has been updated by melifaro:

URL: https://cgit.FreeBSD.org/src/commit/?id=0e87bab6b44b6cc12d25fd46954ee10121ee38fc

commit 0e87bab6b44b6cc12d25fd46954ee10121ee38fc
Author:     Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2022-06-25 23:05:25 +0000
Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
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 <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#include <sys/syslog.h>
 #include <sys/systm.h>
 
 #include <net/if.h>
@@ -77,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 {