From owner-svn-src-user@FreeBSD.ORG  Wed Jun  1 13:15:24 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DABEC1065677;
	Wed,  1 Jun 2011 13:15:24 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CBB148FC15;
	Wed,  1 Jun 2011 13:15:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p51DFOWL071442;
	Wed, 1 Jun 2011 13:15:24 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p51DFOid071440;
	Wed, 1 Jun 2011 13:15:24 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201106011315.p51DFOid071440@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 1 Jun 2011 13:15:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222561 - user/hrs/ipv6/sys/netinet6
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jun 2011 13:15:24 -0000

Author: hrs
Date: Wed Jun  1 13:15:24 2011
New Revision: 222561
URL: http://svn.freebsd.org/changeset/base/222561

Log:
  Fix missing changes in the previous "merge from HEAD".

Modified:
  user/hrs/ipv6/sys/netinet6/in6_proto.c

Modified: user/hrs/ipv6/sys/netinet6/in6_proto.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/in6_proto.c	Wed Jun  1 12:33:05 2011	(r222560)
+++ user/hrs/ipv6/sys/netinet6/in6_proto.c	Wed Jun  1 13:15:24 2011	(r222561)
@@ -392,6 +392,13 @@ VNET_DOMAIN_SET(inet6);
 /*
  * Internet configuration info
  */
+#ifndef	IPV6FORWARDING
+#ifdef GATEWAY6
+#define	IPV6FORWARDING	1	/* forward IP6 packets not for us */
+#else
+#define	IPV6FORWARDING	0	/* don't forward IP6 packets not for us */
+#endif /* GATEWAY6 */
+#endif /* !IPV6FORWARDING */
 
 #ifndef	IPV6_SENDREDIRECTS
 #define	IPV6_SENDREDIRECTS	1