PERFORCE change 113586 for review

[Marko Zec]

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

Change 113586 by zec at 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;