svn commit: r310460 - projects/ipsec/sys/netipsec

[Andrey V. Elsukov]

Author: ae
Date: Fri Dec 23 08:18:49 2016
New Revision: 310460
URL: https://svnweb.freebsd.org/changeset/base/310460

Log:
  Remove last remnants of KEY_DEBUG macro.

Modified:
  projects/ipsec/sys/netipsec/key.c
  projects/ipsec/sys/netipsec/key_debug.h
  projects/ipsec/sys/netipsec/keysock.c

Modified: projects/ipsec/sys/netipsec/key.c
==============================================================================
--- projects/ipsec/sys/netipsec/key.c	Fri Dec 23 07:55:13 2016	(r310459)
+++ projects/ipsec/sys/netipsec/key.c	Fri Dec 23 08:18:49 2016	(r310460)
@@ -7199,12 +7199,6 @@ key_parse(struct mbuf *m, struct socket 
 	IPSEC_ASSERT(so != NULL, ("null socket"));
 	IPSEC_ASSERT(m != NULL, ("null mbuf"));
 
-#if 0	/*kdebug_sadb assumes msg in linear buffer*/
-	KEYDEBUG(KEYDEBUG_KEY_DUMP,
-		ipseclog((LOG_DEBUG, "%s: passed sadb_msg\n", __func__));
-		kdebug_sadb(msg));
-#endif
-
 	if (m->m_len < sizeof(struct sadb_msg)) {
 		m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m)

Modified: projects/ipsec/sys/netipsec/key_debug.h
==============================================================================
--- projects/ipsec/sys/netipsec/key_debug.h	Fri Dec 23 07:55:13 2016	(r310459)
+++ projects/ipsec/sys/netipsec/key_debug.h	Fri Dec 23 08:18:49 2016	(r310460)
@@ -58,9 +58,6 @@
 	    arg;		\
     }
 
-#define KEYDEBUG(lev,arg) \
-	do { if ((V_key_debug_level & (lev)) == (lev)) { arg; } } while (0)
-
 VNET_DECLARE(uint32_t, key_debug_level);
 #define	V_key_debug_level	VNET(key_debug_level)
 #endif /*_KERNEL*/

Modified: projects/ipsec/sys/netipsec/keysock.c
==============================================================================
--- projects/ipsec/sys/netipsec/keysock.c	Fri Dec 23 07:55:13 2016	(r310459)
+++ projects/ipsec/sys/netipsec/keysock.c	Fri Dec 23 08:18:49 2016	(r310460)
@@ -115,7 +115,7 @@ key_output(struct mbuf *m, struct socket
 
 	M_ASSERTPKTHDR(m);
 
-	KEYDEBUG(KEYDEBUG_KEY_DUMP, kdebug_mbuf(m));
+	KEYDBG(KEY_DUMP, kdebug_mbuf(m));
 
 	msg = mtod(m, struct sadb_msg *);
 	PFKEYSTAT_INC(out_msgtype[msg->sadb_msg_type]);
@@ -181,9 +181,9 @@ key_sendup(struct socket *so, struct sad
 	if (so == NULL || msg == NULL)
 		panic("%s: NULL pointer was passed.\n", __func__);
 
-	KEYDEBUG(KEYDEBUG_KEY_DUMP,
-		printf("%s: \n", __func__);
-		kdebug_sadb(msg));
+	KEYDBG(KEY_DUMP,
+	    printf("%s: \n", __func__);
+	    kdebug_sadb(msg));
 
 	/*
 	 * we increment statistics here, just in case we have ENOBUFS