summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorcsjp <csjp@FreeBSD.org>2006-02-02 16:41:20 +0000
committercsjp <csjp@FreeBSD.org>2006-02-02 16:41:20 +0000
commitc8f0963c9e61ccb376847f9be4be743370b21162 (patch)
tree48fecc7a8654f8c7a4272318f93450e015796be9 /sys/net
parent8e3e7864a87270e57c53148cc2d149b1c76972c9 (diff)
downloadFreeBSD-src-c8f0963c9e61ccb376847f9be4be743370b21162.zip
FreeBSD-src-c8f0963c9e61ccb376847f9be4be743370b21162.tar.gz
Use PFIL_HOOKED macros in if_bridge and pass the right argument to
rw_assert. This un-breaks the build. Submitted by: Kostik Belousov Pointy hat to: csjp
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_bridge.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 1ec9e62..6be9ab6 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1531,9 +1531,9 @@ bridge_dummynet(struct mbuf *m, struct ifnet *ifp)
return;
}
- if (inet_pfil_hook.ph_busy_count >= 0
+ if (PFIL_HOOKED(&inet_pfil_hook)
#ifdef INET6
- || inet6_pfil_hook.ph_busy_count >= 0
+ || PFIL_HOOKED(&inet6_pfil_hook)
#endif
) {
if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0)
@@ -1800,9 +1800,9 @@ bridge_forward(struct bridge_softc *sc, struct mbuf *m)
}
/* run the packet filter */
- if (inet_pfil_hook.ph_busy_count >= 0
+ if (PFIL_HOOKED(&inet_pfil_hook)
#ifdef INET6
- || inet6_pfil_hook.ph_busy_count >= 0
+ || PFIL_HOOKED(&inet6_pfil_hook)
#endif
) {
BRIDGE_UNLOCK(sc);
@@ -1857,9 +1857,9 @@ bridge_forward(struct bridge_softc *sc, struct mbuf *m)
BRIDGE_UNLOCK(sc);
- if (inet_pfil_hook.ph_busy_count >= 0
+ if (PFIL_HOOKED(&inet_pfil_hook)
#ifdef INET6
- || inet6_pfil_hook.ph_busy_count >= 0
+ || PFIL_HOOKED(&inet6_pfil_hook)
#endif
) {
if (bridge_pfil(&m, sc->sc_ifp, dst_if, PFIL_OUT) != 0)
@@ -2055,9 +2055,9 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
}
/* Filter on the bridge interface before broadcasting */
- if (runfilt && (inet_pfil_hook.ph_busy_count >= 0
+ if (runfilt && (PFIL_HOOKED(&inet_pfil_hook)
#ifdef INET6
- || inet6_pfil_hook.ph_busy_count >= 0
+ || PFIL_HOOKED(&inet6_pfil_hook)
#endif
)) {
if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0)
@@ -2102,9 +2102,9 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
* pointer so we do not redundantly filter on the bridge for
* each interface we broadcast on.
*/
- if (runfilt && (inet_pfil_hook.ph_busy_count >= 0
+ if (runfilt && (PFIL_HOOKED(&inet_pfil_hook)
#ifdef INET6
- || inet6_pfil_hook.ph_busy_count >= 0
+ || PFIL_HOOKED(&inet6_pfil_hook)
#endif
)) {
if (bridge_pfil(&mc, NULL, dst_if, PFIL_OUT) != 0)
OpenPOWER on IntegriCloud