From owner-svn-src-head@FreeBSD.ORG  Sat Aug 27 08:49:55 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 D7A23106566B;
	Sat, 27 Aug 2011 08:49:55 +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 C72468FC12;
	Sat, 27 Aug 2011 08:49:55 +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 p7R8ntgF092027;
	Sat, 27 Aug 2011 08:49:55 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7R8ntHd092024;
	Sat, 27 Aug 2011 08:49:55 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201108270849.p7R8ntHd092024@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 27 Aug 2011 08:49:55 +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: r225209 - 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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Aug 2011 08:49:55 -0000

Author: bz
Date: Sat Aug 27 08:49:55 2011
New Revision: 225209
URL: http://svn.freebsd.org/changeset/base/225209

Log:
  When adding IPv6 fwd support to ipfw in r225044 these two files were
  not committed.  Initialize next_hop6 to align with the IPv4 code.
  
  PR:		bin/117214
  MFC after:	3 weeks
  X-MFC with:	r225044
  Approved by:	re (kib)

Modified:
  head/sys/net/if_bridge.c
  head/sys/net/if_ethersubr.c

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c	Sat Aug 27 06:54:08 2011	(r225208)
+++ head/sys/net/if_bridge.c	Sat Aug 27 08:49:55 2011	(r225209)
@@ -3083,6 +3083,7 @@ bridge_pfil(struct mbuf **mp, struct ifn
 		args.m = *mp;
 		args.oif = ifp;
 		args.next_hop = NULL;
+		args.next_hop6 = NULL;
 		args.eh = &eh2;
 		args.inp = NULL;	/* used by ipfw uid/gid/jail rules */
 		i = V_ip_fw_chk_ptr(&args);

Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c	Sat Aug 27 06:54:08 2011	(r225208)
+++ head/sys/net/if_ethersubr.c	Sat Aug 27 08:49:55 2011	(r225209)
@@ -499,6 +499,7 @@ ether_ipfw_chk(struct mbuf **m0, struct 
 	args.m = m;		/* the packet we are looking at		*/
 	args.oif = dst;		/* destination, if any			*/
 	args.next_hop = NULL;	/* we do not support forward yet	*/
+	args.next_hop6 = NULL;	/* we do not support forward yet	*/
 	args.eh = &save_eh;	/* MAC header for bridged/MAC packets	*/
 	args.inp = NULL;	/* used by ipfw uid/gid/jail rules	*/
 	i = V_ip_fw_chk_ptr(&args);