diff options
author | jkim <jkim@FreeBSD.org> | 2008-08-26 16:12:49 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2008-08-26 16:12:49 +0000 |
commit | e8ca7cbe6fda4b5bdcbdc4d54d48548c6c53a24f (patch) | |
tree | 2eafd31f253423307919e4f8ee9a6d4bc95dffdd /sys | |
parent | 08e8549c49ad71e5e3966a1c1616cb6e7ff009e1 (diff) | |
download | FreeBSD-src-e8ca7cbe6fda4b5bdcbdc4d54d48548c6c53a24f.zip FreeBSD-src-e8ca7cbe6fda4b5bdcbdc4d54d48548c6c53a24f.tar.gz |
Revert the previous commit to fix buildworld for now.
We have constified 'struct bpf_insn *' for bpf_filter(9) and bpf_validate(9)
since r1.19 but they conflict with pcap.h from libpcap.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/net/bpf.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 893abb4..3d3d079 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -849,6 +849,7 @@ void bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **); void bpfdetach(struct ifnet *); void bpfilterattach(int); +u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int); static __inline int bpf_peers_present(struct bpf_if *bpf) @@ -877,8 +878,6 @@ bpf_peers_present(struct bpf_if *bpf) } while (0) #endif -u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int); - /* * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST). */ |