From owner-p4-projects@FreeBSD.ORG  Sat Sep  8 18:24:22 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 461F016A469; Sat,  8 Sep 2007 18:24:22 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B5B416A41A
	for <perforce@FreeBSD.org>; Sat,  8 Sep 2007 18:24:22 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E5A1913C4B7
	for <perforce@FreeBSD.org>; Sat,  8 Sep 2007 18:24:21 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l88IOLvH076914
	for <perforce@FreeBSD.org>; Sat, 8 Sep 2007 18:24:21 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l88IOLvS076911
	for perforce@freebsd.org; Sat, 8 Sep 2007 18:24:21 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sat, 8 Sep 2007 18:24:21 GMT
Message-Id: <200709081824.l88IOLvS076911@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126193 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Sep 2007 18:24:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=126193

Change 126193 by zec@zec_tpx32 on 2007/09/08 18:23:19

	Wrap an INET6 related sysctl instance into an #ifdef,
	fixing compilation issues with nooptions INET6 configurations.
	
	While here, clean up some whitespace noise.

Affected files ...

.. //depot/projects/vimage/src/sys/net/if_gif.c#11 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/if_gif.c#11 (text+ko) ====

@@ -131,11 +131,13 @@
 static int max_gif_nesting;
 #endif
 SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, max_nesting,
-	CTLFLAG_RW, max_gif_nesting, 0, "Max nested tunnels");
+    CTLFLAG_RW, max_gif_nesting, 0, "Max nested tunnels");
 
+#ifdef INET6
 SYSCTL_DECL(_net_inet6_ip6);
 SYSCTL_V_INT(V_NET, vnet_gif, _net_inet6_ip6, IPV6CTL_GIF_HLIM,
-        gifhlim, CTLFLAG_RW,    ip6_gif_hlim,                   0, "");
+    gifhlim, CTLFLAG_RW, ip6_gif_hlim, 0, "");
+#endif
 
 /*
  * By default, we disallow creation of multiple tunnels between the same
@@ -244,7 +246,6 @@
 	V_parallel_tunnels = 1;
 #endif
 	V_ip_gif_ttl = GIF_TTL;
-
 #ifdef INET6
 	V_ip6_gif_hlim = GIF_HLIM;
 #endif