From 2ae7ec29fdc503579c8cc2b62714e3057c800ce2 Mon Sep 17 00:00:00 2001 From: Julian Elischer Date: Sun, 7 Feb 2010 09:00:22 +0000 Subject: MFC of 197952 and 198075 Virtualize the pfil hooks so that different jails may chose different packet filters. ALso allows ipfw to be enabled on on ejail and disabled on another. In 8.0 it's a global setting. and Unbreak the VIMAGE build with IPSEC, broken with r197952 by virtualizing the pfil hooks. For consistency add the V_ to virtualize the pfil hooks in here as well. --- sys/netgraph/ng_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/netgraph') diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c index e42b5a547f03..c6f41836cca5 100644 --- a/sys/netgraph/ng_bridge.c +++ b/sys/netgraph/ng_bridge.c @@ -634,7 +634,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item) /* Run packet through ipfw processing, if enabled */ #if 0 - if (priv->conf.ipfw[linkNum] && V_fw_enable && ip_fw_chk_ptr != NULL) { + if (priv->conf.ipfw[linkNum] && V_fw_enable && V_ip_fw_chk_ptr != NULL) { /* XXX not implemented yet */ } #endif -- cgit v1.3