From owner-svn-src-projects@freebsd.org  Mon Dec 26 21:27:23 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
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 54B34C92C06
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 26 Dec 2016 21:27:23 +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 1C0FE1353;
 Mon, 26 Dec 2016 21:27:23 +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 uBQLRMWk016299;
 Mon, 26 Dec 2016 21:27:22 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQLRMh1016297;
 Mon, 26 Dec 2016 21:27:22 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201612262127.uBQLRMh1016297@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 26 Dec 2016 21:27:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r310620 - 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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Dec 2016 21:27:23 -0000

Author: ae
Date: Mon Dec 26 21:27:21 2016
New Revision: 310620
URL: https://svnweb.freebsd.org/changeset/base/310620

Log:
  Use IPSEC_MODULE_ENABLED macro instead of magic number.

Modified:
  projects/ipsec/sys/netipsec/ipsec_mod.c
  projects/ipsec/sys/netipsec/xform_tcp.c

Modified: projects/ipsec/sys/netipsec/ipsec_mod.c
==============================================================================
--- projects/ipsec/sys/netipsec/ipsec_mod.c	Mon Dec 26 21:09:02 2016	(r310619)
+++ projects/ipsec/sys/netipsec/ipsec_mod.c	Mon Dec 26 21:27:21 2016	(r310620)
@@ -69,7 +69,7 @@ static const struct ipsec_methods ipv4_m
 };
 #ifndef KLD_MODULE
 static const struct ipsec_support ipv4_ipsec = {
-	.enabled = 1,
+	.enabled = IPSEC_MODULE_ENABLED,
 	.methods = &ipv4_methods
 };
 const struct ipsec_support * const ipv4_ipsec_support = &ipv4_ipsec;
@@ -88,7 +88,7 @@ static const struct ipsec_methods ipv6_m
 };
 #ifndef KLD_MODULE
 static const struct ipsec_support ipv6_ipsec = {
-	.enabled = 1,
+	.enabled = IPSEC_MODULE_ENABLED,
 	.methods = &ipv6_methods
 };
 const struct ipsec_support * const ipv6_ipsec_support = &ipv6_ipsec;

Modified: projects/ipsec/sys/netipsec/xform_tcp.c
==============================================================================
--- projects/ipsec/sys/netipsec/xform_tcp.c	Mon Dec 26 21:09:02 2016	(r310619)
+++ projects/ipsec/sys/netipsec/xform_tcp.c	Mon Dec 26 21:27:21 2016	(r310620)
@@ -393,7 +393,7 @@ static const struct tcpmd5_methods tcpmd
 #ifndef KLD_MODULE
 /* TCP-MD5 support is build in the kernel */
 static const struct tcpmd5_support tcpmd5_ipsec = {
-	.enabled = 1,
+	.enabled = IPSEC_MODULE_ENABLED,
 	.methods = &tcpmd5_methods
 };
 const struct tcpmd5_support * const tcp_ipsec_support = &tcpmd5_ipsec;