From owner-svn-src-all@freebsd.org  Thu Jul 30 10:26:45 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 B5A029AB622;
 Thu, 30 Jul 2015 10:26:45 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 A60A31E5C;
 Thu, 30 Jul 2015 10:26:45 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6UAQjfn067373;
 Thu, 30 Jul 2015 10:26:45 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6UAQi53067370;
 Thu, 30 Jul 2015 10:26:44 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201507301026.t6UAQi53067370@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, 30 Jul 2015 10:26:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286069 - in head/sys: modules modules/if_stf net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jul 2015 10:26:45 -0000

Author: ae
Date: Thu Jul 30 10:26:43 2015
New Revision: 286069
URL: https://svnweb.freebsd.org/changeset/base/286069

Log:
  Build if_stf(4) module only when both INET and INET6 support are enabled.

Modified:
  head/sys/modules/Makefile
  head/sys/modules/if_stf/Makefile
  head/sys/net/if_stf.c

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Thu Jul 30 10:09:31 2015	(r286068)
+++ head/sys/modules/Makefile	Thu Jul 30 10:26:43 2015	(r286069)
@@ -149,7 +149,7 @@ SUBDIR=	\
 	${_if_me} \
 	if_lagg \
 	${_if_ndis} \
-	if_stf \
+	${_if_stf} \
 	if_tap \
 	if_tun \
 	if_vlan \
@@ -411,6 +411,11 @@ _if_gif=	if_gif
 _if_gre=	if_gre
 .endif
 
+.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
+	defined(ALL_MODULES)
+_if_stf=	if_stf
+.endif
+
 .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
 _if_me=		if_me
 _ipdivert=	ipdivert

Modified: head/sys/modules/if_stf/Makefile
==============================================================================
--- head/sys/modules/if_stf/Makefile	Thu Jul 30 10:09:31 2015	(r286068)
+++ head/sys/modules/if_stf/Makefile	Thu Jul 30 10:26:43 2015	(r286069)
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_stf
-SRCS=	if_stf.c opt_inet.h opt_inet6.h
+SRCS=	if_stf.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/net/if_stf.c
==============================================================================
--- head/sys/net/if_stf.c	Thu Jul 30 10:09:31 2015	(r286068)
+++ head/sys/net/if_stf.c	Thu Jul 30 10:26:43 2015	(r286069)
@@ -74,9 +74,6 @@
  * Note that there is no way to be 100% secure.
  */
 
-#include "opt_inet.h"
-#include "opt_inet6.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>