Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Aug 2011 08:49:55 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r225209 - head/sys/net
Message-ID:  <201108270849.p7R8ntHd092024@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108270849.p7R8ntHd092024>