From 4df648afc0bb807ffe994654dd8c3d4804c5ccd7 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 22 Feb 2005 02:52:48 +0000
Subject: [PATCH] Conditionalize the source on INET and INET6 respectively.
 This is already done for the normal static kernel and simplifies the module
 configuration.

---
 sys/netinet/in_gif.c   | 5 ++++-
 sys/netinet6/in6_gif.c | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 64af73eaf5..14f9fa74d1 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,6 +1,6 @@
 /*
  * $FreeBSD: src/sys/netinet/in_gif.c,v 1.5.2.11 2003/01/23 21:06:45 sam Exp $
- * $DragonFly: src/sys/netinet/in_gif.c,v 1.13 2005/01/06 17:59:32 hsu Exp $
+ * $DragonFly: src/sys/netinet/in_gif.c,v 1.14 2005/02/22 02:52:48 joerg Exp $
  * $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $
  */
 /*
@@ -70,6 +70,7 @@
 
 #include <sys/thread2.h>	/* ipstat */
 
+#ifdef INET
 static int gif_validate4 (const struct ip *, struct gif_softc *,
 			  struct ifnet *);
 
@@ -389,3 +390,5 @@ in_gif_detach(struct gif_softc *sc)
 		sc->encap_cookie4 = NULL;
 	return error;
 }
+
+#endif /* INET */
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index f8cd4f4eb4..fb056f1e18 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.2.2.7 2003/01/23 21:06:47 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/in6_gif.c,v 1.12 2005/02/01 16:09:37 hrs Exp $	*/
+/*	$DragonFly: src/sys/netinet6/in6_gif.c,v 1.13 2005/02/22 02:52:48 joerg Exp $	*/
 /*	$KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $	*/
 
 /*
@@ -71,6 +71,7 @@
 
 #include <net/net_osdep.h>
 
+#ifdef INET6
 static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
 			 struct ifnet *);
 
@@ -383,3 +384,5 @@ in6_gif_detach(struct gif_softc *sc)
 		sc->encap_cookie6 = NULL;
 	return error;
 }
+
+#endif /* INET6 */
-- 
2.41.0