diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2014-02-19 22:02:15 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2014-02-19 22:02:15 +0000 |
| commit | 5748b897da441d1f10e1fe0c39155ea33d6d383a (patch) | |
| tree | 7c8754b66fd2a59523982c11a17a367cbfcb1520 /sys/netpfil/ipfw/ip_fw_pfil.c | |
| parent | 654957c2c861b1483df873678439699c0dfeeb94 (diff) | |
| parent | 2067168264b9ab5abb628187a3c56180e7767e7b (diff) | |
| download | src-5748b897da441d1f10e1fe0c39155ea33d6d383a.tar.gz src-5748b897da441d1f10e1fe0c39155ea33d6d383a.zip | |
Merge head up to r262222 (last merge was incomplete).
Notes
Notes:
svn path=/projects/pf/head/; revision=262234
Diffstat (limited to 'sys/netpfil/ipfw/ip_fw_pfil.c')
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_pfil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netpfil/ipfw/ip_fw_pfil.c b/sys/netpfil/ipfw/ip_fw_pfil.c index 79973b1f05c7..dcef12a21669 100644 --- a/sys/netpfil/ipfw/ip_fw_pfil.c +++ b/sys/netpfil/ipfw/ip_fw_pfil.c @@ -82,9 +82,9 @@ int ipfw_chg_hook(SYSCTL_HANDLER_ARGS); /* Forward declarations. */ static int ipfw_divert(struct mbuf **, int, struct ipfw_rule_ref *, int); -static int ipfw_check_packet(void *, struct mbuf **, struct ifnet *, int, +int ipfw_check_packet(void *, struct mbuf **, struct ifnet *, int, struct inpcb *); -static int ipfw_check_frame(void *, struct mbuf **, struct ifnet *, int, +int ipfw_check_frame(void *, struct mbuf **, struct ifnet *, int, struct inpcb *); #ifdef SYSCTL_NODE @@ -116,7 +116,7 @@ SYSEND * dummynet, divert, netgraph or other modules. * The packet may be consumed. */ -static int +int ipfw_check_packet(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir, struct inpcb *inp) { @@ -292,7 +292,7 @@ again: * Inteface is NULL from ether_demux, and ifp from * ether_output_frame. */ -static int +int ipfw_check_frame(void *arg, struct mbuf **m0, struct ifnet *dst, int dir, struct inpcb *inp) { |