From owner-svn-src-projects@freebsd.org Fri Dec 23 08:18:50 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5DE5C89228 for ; Fri, 23 Dec 2016 08:18:50 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6BEFB1C5B; Fri, 23 Dec 2016 08:18:50 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBN8InNn021087; Fri, 23 Dec 2016 08:18:49 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBN8Incr021084; Fri, 23 Dec 2016 08:18:49 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201612230818.uBN8Incr021084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Fri, 23 Dec 2016 08:18:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r310460 - projects/ipsec/sys/netipsec X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Dec 2016 08:18:50 -0000 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