diff options
| author | luigi <luigi@FreeBSD.org> | 2001-11-04 22:56:25 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2001-11-04 22:56:25 +0000 |
| commit | f565e0a1dff9f306dcf2a7ce69991a22170dfa34 (patch) | |
| tree | c941161cecb4fb744bf3988da945ddfd0a75a240 /sys/netinet/ip_output.c | |
| parent | 473a686e79edeaa4c5a1b0e1fced3d7dcc9ef444 (diff) | |
| download | FreeBSD-src-f565e0a1dff9f306dcf2a7ce69991a22170dfa34.zip FreeBSD-src-f565e0a1dff9f306dcf2a7ce69991a22170dfa34.tar.gz | |
MFS: sync the ipfw/dummynet/bridge code with the one recently merged
into stable (mostly , but not only, formatting and comments changes).
Diffstat (limited to 'sys/netinet/ip_output.c')
| -rw-r--r-- | sys/netinet/ip_output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 060c4c0..304aa4d 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -586,10 +586,10 @@ skip_ipsec: /* * Check with the firewall... */ - if (fw_enable && ip_fw_chk_ptr) { + if (fw_enable && IPFW_LOADED) { struct sockaddr_in *old = dst; - off = (*ip_fw_chk_ptr)(&ip, + off = ip_fw_chk_ptr(&ip, hlen, ifp, &divert_cookie, &m, &rule, &dst); /* * On return we must do the following: @@ -623,7 +623,7 @@ skip_ipsec: } if (off == 0 && dst == old) /* common case */ goto pass ; - if (ip_dn_io_ptr != NULL && (off & IP_FW_PORT_DYNT_FLAG) != 0) { + if (DUMMYNET_LOADED && (off & IP_FW_PORT_DYNT_FLAG) != 0) { /* * pass the pkt to dummynet. Need to include * pipe number, m, ifp, ro, dst because these are |
