From owner-p4-projects@FreeBSD.ORG  Sat Jan 27 01:49:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9194716A406; Sat, 27 Jan 2007 01:49:39 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 62CF516A402
	for <perforce@FreeBSD.org>; Sat, 27 Jan 2007 01:49:39 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5369813C4A3
	for <perforce@FreeBSD.org>; Sat, 27 Jan 2007 01:49:39 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0R1ndV6016337
	for <perforce@FreeBSD.org>; Sat, 27 Jan 2007 01:49:39 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0R1ndUQ016334
	for perforce@freebsd.org; Sat, 27 Jan 2007 01:49:39 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sat, 27 Jan 2007 01:49:39 GMT
Message-Id: <200701270149.l0R1ndUQ016334@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 113586 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, 27 Jan 2007 01:49:39 -0000

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

Change 113586 by zec@zec_tca51 on 2007/01/27 01:48:59

	Honor the XBONEHACK option when initializing gif knobs.

Affected files ...

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

Differences ...

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

@@ -140,11 +140,7 @@
  * we allow control over this check here.
  */
 #ifndef VIMAGE
-#ifdef XBONEHACK
-static int parallel_tunnels = 1;
-#else
-static int parallel_tunnels = 0;
-#endif
+static int parallel_tunnels;
 #endif
 SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels,
 	CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?");
@@ -256,7 +252,10 @@
 
 	LIST_INIT(&V_gif_softc_list);
 	V_max_gif_nesting = MAX_GIF_NEST;
-        V_ip_gif_ttl = GIF_TTL;
+#ifdef XBONEHACK
+	V_parallel_tunnels = 1;
+#endif
+	V_ip_gif_ttl = GIF_TTL;
 
 #ifdef INET6
 	V_ip6_gif_hlim = GIF_HLIM;