diff options
| author | kp <kp@FreeBSD.org> | 2015-06-18 21:21:52 +0000 |
|---|---|---|
| committer | kp <kp@FreeBSD.org> | 2015-06-18 21:21:52 +0000 |
| commit | 7d05cb134c7ce76e4819dc6604a11ef7f2c63a1f (patch) | |
| tree | eb6ca1c2c9d97c95c374fc5691212a8ad2f8556e /sys/net | |
| parent | 7602db847b7820a651918f47a72aec1ab5f309e6 (diff) | |
| download | FreeBSD-src-7d05cb134c7ce76e4819dc6604a11ef7f2c63a1f.zip FreeBSD-src-7d05cb134c7ce76e4819dc6604a11ef7f2c63a1f.tar.gz | |
Merge r278874, r278925, r278868
- Improve INET/INET6 scope.
- style(9) declarations.
- Make couple of local functions static.
- Even more fixes to !INET and !INET6 kernels.
In collaboration with pluknet
- Toss declarations to fix regular build and NO_INET6 build.
Differential Revision: https://reviews.freebsd.org/D2823
Reviewed by: gnn
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pfvar.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index fe2d88f..ebed1c3 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1566,14 +1566,18 @@ void pf_free_rule(struct pf_rule *); #ifdef INET int pf_test(int, struct ifnet *, struct mbuf **, struct inpcb *); +int pf_normalize_ip(struct mbuf **, int, struct pfi_kif *, u_short *, + struct pf_pdesc *); #endif /* INET */ #ifdef INET6 int pf_test6(int, struct ifnet *, struct mbuf **, struct inpcb *); +int pf_normalize_ip6(struct mbuf **, int, struct pfi_kif *, u_short *, + struct pf_pdesc *); void pf_poolmask(struct pf_addr *, struct pf_addr*, struct pf_addr *, struct pf_addr *, u_int8_t); void pf_addr_inc(struct pf_addr *, sa_family_t); -int pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag); +int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *); #endif /* INET6 */ u_int32_t pf_new_isn(struct pf_state *); @@ -1589,10 +1593,6 @@ int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); void pf_normalize_init(void); void pf_normalize_cleanup(void); -int pf_normalize_ip(struct mbuf **, int, struct pfi_kif *, u_short *, - struct pf_pdesc *); -int pf_normalize_ip6(struct mbuf **, int, struct pfi_kif *, u_short *, - struct pf_pdesc *); int pf_normalize_tcp(int, struct pfi_kif *, struct mbuf *, int, int, void *, struct pf_pdesc *); void pf_normalize_tcp_cleanup(struct pf_state *); |
