From owner-svn-src-head@FreeBSD.ORG Wed Jun 10 13:39:51 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A29E1065670; Wed, 10 Jun 2009 13:39:51 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 78D958FC22; Wed, 10 Jun 2009 13:39:51 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ADdpQ6014804; Wed, 10 Jun 2009 13:39:51 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ADdph6014803; Wed, 10 Jun 2009 13:39:51 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200906101339.n5ADdph6014803@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 10 Jun 2009 13:39:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193913 - head/sys/net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 13:39:52 -0000 Author: bz Date: Wed Jun 10 13:39:51 2009 New Revision: 193913 URL: http://svn.freebsd.org/changeset/base/193913 Log: ip_gif_ttl/GIF_TTL are only used by the inet part in in_gif.c, so put the initialization under #ifdef INET. Modified: head/sys/net/if_gif.c Modified: head/sys/net/if_gif.c ============================================================================== --- head/sys/net/if_gif.c Wed Jun 10 13:04:07 2009 (r193912) +++ head/sys/net/if_gif.c Wed Jun 10 13:39:51 2009 (r193913) @@ -274,7 +274,9 @@ vnet_gif_iattach(const void *unused __un #else V_parallel_tunnels = 0; #endif +#ifdef INET V_ip_gif_ttl = GIF_TTL; +#endif #ifdef INET6 V_ip6_gif_hlim = GIF_HLIM; #endif