From owner-svn-src-projects@freebsd.org  Thu Dec 22 14:09:02 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 8D390C8AA4C
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 22 Dec 2016 14:09:02 +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 5D4631275;
 Thu, 22 Dec 2016 14:09:02 +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 uBME91MM069550;
 Thu, 22 Dec 2016 14:09:01 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBME9122069548;
 Thu, 22 Dec 2016 14:09:01 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201612221409.uBME9122069548@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: Thu, 22 Dec 2016 14:09:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r310407 - projects/ipsec/sys/netinet6
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: Thu, 22 Dec 2016 14:09:02 -0000

Author: ae
Date: Thu Dec 22 14:09:01 2016
New Revision: 310407
URL: https://svnweb.freebsd.org/changeset/base/310407

Log:
  Remove unneded includes and ifdefs.

Modified:
  projects/ipsec/sys/netinet6/in6.h
  projects/ipsec/sys/netinet6/sctp6_usrreq.c

Modified: projects/ipsec/sys/netinet6/in6.h
==============================================================================
--- projects/ipsec/sys/netinet6/in6.h	Thu Dec 22 14:08:17 2016	(r310406)
+++ projects/ipsec/sys/netinet6/in6.h	Thu Dec 22 14:09:01 2016	(r310407)
@@ -432,10 +432,7 @@ struct route_in6 {
 #define IPV6_BINDV6ONLY		IPV6_V6ONLY
 #endif
 
-#if 1 /* IPSEC */
 #define IPV6_IPSEC_POLICY	28 /* struct; get/set security policy */
-#endif /* IPSEC */
-
 				   /* 29; unused; was IPV6_FAITH */
 #if 1 /* IPV6FIREWALL */
 #define IPV6_FW_ADD		30 /* add a firewall rule to chain */

Modified: projects/ipsec/sys/netinet6/sctp6_usrreq.c
==============================================================================
--- projects/ipsec/sys/netinet6/sctp6_usrreq.c	Thu Dec 22 14:08:17 2016	(r310406)
+++ projects/ipsec/sys/netinet6/sctp6_usrreq.c	Thu Dec 22 14:09:01 2016	(r310407)
@@ -55,11 +55,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/icmp6.h>
 #include <netinet/udp.h>
 
-#ifdef IPSEC
-#include <netipsec/ipsec.h>
-#include <netipsec/ipsec6.h>
-#endif				/* IPSEC */
-
 extern struct protosw inetsw[];
 
 int