From fc228fbf491ac59117a689e202b01015b9f8fc0c Mon Sep 17 00:00:00 2001
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 10 Jun 2009 19:25:46 +0000
Subject: [PATCH] Properly hide IPv4 only variables and functions under #ifdef
 INET.

---
 sys/netipsec/ipsec.c       | 2 ++
 sys/netipsec/ipsec_input.c | 2 ++
 sys/netipsec/xform_ipip.c  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 4eef0647e01a..dabd5b6078c7 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1702,6 +1702,7 @@ vshiftl(unsigned char *bitmap, int nbit, int wsize)
 	}
 }
 
+#ifdef INET
 /* Return a printable string for the IPv4 address. */
 static char *
 inet_ntoa4(struct in_addr ina)
@@ -1716,6 +1717,7 @@ inet_ntoa4(struct in_addr ina)
 	    ucp[2] & 0xff, ucp[3] & 0xff);
 	return (buf[i]);
 }
+#endif
 
 /* Return a printable string for the address. */
 char *
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 62ded7b548ee..ce6b06080691 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -103,7 +103,9 @@
 #define IPSEC_ISTAT(p,x,y,z) ((p) == IPPROTO_ESP ? (x)++ : \
 			    (p) == IPPROTO_AH ? (y)++ : (z)++)
 
+#ifdef INET
 static void ipsec4_common_ctlinput(int, struct sockaddr *, void *, int);
+#endif
 
 /*
  * ipsec_common_input gets called when an IPsec-protected packet
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index e395f1b01d81..d9cf8c6fe299 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -171,7 +171,9 @@ _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp)
 {
 	INIT_VNET_NET(curvnet);
 	INIT_VNET_IPSEC(curvnet);
+#ifdef INET
 	register struct sockaddr_in *sin;
+#endif
 	register struct ifnet *ifp;
 	register struct ifaddr *ifa;
 	struct ip *ipo;