summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2011-08-27 08:49:55 +0000
committerbz <bz@FreeBSD.org>2011-08-27 08:49:55 +0000
commit75529036c4053c147bc25c97cdce45422f260647 (patch)
tree16966157535b27831e1e264b64fd1cc53bd7c45f
parent3f14675cff336d6d19e9cffbd2f4d4a28beb7dca (diff)
downloadFreeBSD-src-75529036c4053c147bc25c97cdce45422f260647.zip
FreeBSD-src-75529036c4053c147bc25c97cdce45422f260647.tar.gz
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)
-rw-r--r--sys/net/if_bridge.c1
-rw-r--r--sys/net/if_ethersubr.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 5ac4ef0..a4bf2b2 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -3083,6 +3083,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
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);
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index aa8113b..1d16ae6 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -499,6 +499,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, int shared)
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);
OpenPOWER on IntegriCloud