Date: Tue, 3 Sep 2013 19:07:02 +0000 (UTC) From: Takuya ASADA <syuu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r255189 - user/syuu/mq_bpf/sys/net Message-ID: <201309031907.r83J727i046581@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: syuu Date: Tue Sep 3 19:07:01 2013 New Revision: 255189 URL: http://svnweb.freebsd.org/changeset/base/255189 Log: bpfq.h Modified: user/syuu/mq_bpf/sys/net/bpf.h user/syuu/mq_bpf/sys/net/bpfdesc.h Modified: user/syuu/mq_bpf/sys/net/bpf.h ============================================================================== --- user/syuu/mq_bpf/sys/net/bpf.h Tue Sep 3 18:46:11 2013 (r255188) +++ user/syuu/mq_bpf/sys/net/bpf.h Tue Sep 3 19:07:01 2013 (r255189) @@ -40,6 +40,8 @@ #ifndef _NET_BPF_H_ #define _NET_BPF_H_ +#include <net/bpfq.h> + /* BSD style release date */ #define BPF_RELEASE 199606 @@ -115,36 +117,6 @@ struct bpf_zbuf { size_t bz_buflen; /* Size of zero-copy buffers. */ }; -#ifndef _KERNEL -#include <sys/param.h> -#include <sys/bitset.h> -#include <sys/_bitset.h> - -#define BPFQ_BITS 256 -BITSET_DEFINE(bpf_qmask_bits, BPFQ_BITS); - -#define BPFQ_CLR(n, p) BIT_CLR(BPFQ_BITS, n, p) -#define BPFQ_COPY(f, t) BIT_COPY(BPFQ_BITS, f, t) -#define BPFQ_ISSET(n, p) BIT_ISSET(BPFQ_BITS, n, p) -#define BPFQ_SET(n, p) BIT_SET(BPFQ_BITS, n, p) -#define BPFQ_ZERO(p) BIT_ZERO(BPFQ_BITS, p) -#define BPFQ_FILL(p) BIT_FILL(BPFQ_BITS, p) -#define BPFQ_SETOF(n, p) BIT_SETOF(BPFQ_BITS, n, p) -#define BPFQ_EMPTY(p) BIT_EMPTY(BPFQ_BITS, p) -#define BPFQ_ISFULLSET(p) BIT_ISFULLSET(BPFQ_BITS, p) -#define BPFQ_SUBSET(p, c) BIT_SUBSET(BPFQ_BITS, p, c) -#define BPFQ_OVERLAP(p, c) BIT_OVERLAP(BPFQ_BITS, p, c) -#define BPFQ_CMP(p, c) BIT_CMP(BPFQ_BITS, p, c) -#define BPFQ_OR(d, s) BIT_OR(BPFQ_BITS, d, s) -#define BPFQ_AND(d, s) BIT_AND(BPFQ_BITS, d, s) -#define BPFQ_NAND(d, s) BIT_NAND(BPFQ_BITS, d, s) -#define BPFQ_CLR_ATOMIC(n, p) BIT_CLR_ATOMIC(BPFQ_BITS, n, p) -#define BPFQ_SET_ATOMIC(n, p) BIT_SET_ATOMIC(BPFQ_BITS, n, p) -#define BPFQ_OR_ATOMIC(d, s) BIT_OR_ATOMIC(BPFQ_BITS, d, s) -#define BPFQ_COPY_STORE_REL(f, t) BIT_COPY_STORE_REL(BPFQ_BITS, f, t) -#define BPFQ_FFS(p) BIT_FFS(BPFQ_BITS, p) -#endif - #define BIOCGBLEN _IOR('B', 102, u_int) #define BIOCSBLEN _IOWR('B', 102, u_int) #define BIOCSETF _IOW('B', 103, struct bpf_program) Modified: user/syuu/mq_bpf/sys/net/bpfdesc.h ============================================================================== --- user/syuu/mq_bpf/sys/net/bpfdesc.h Tue Sep 3 18:46:11 2013 (r255188) +++ user/syuu/mq_bpf/sys/net/bpfdesc.h Tue Sep 3 19:07:01 2013 (r255189) @@ -43,12 +43,8 @@ #include <sys/selinfo.h> #include <sys/queue.h> #include <sys/conf.h> -#include <sys/bitset.h> -#include <sys/_bitset.h> #include <net/if.h> - -#define BPFQ_BITS 256 -BITSET_DEFINE(bpf_qmask_bits, BPFQ_BITS); +#include <net/bpfq.h> struct bpf_qmask { int qm_enabled; @@ -65,27 +61,6 @@ struct bpf_qmask { #define BPFQ_WLOCK(qm) rw_wlock(&(qm)->qm_lock) #define BPFQ_WUNLOCK(qm) rw_wunlock(&(qm)->qm_lock) -#define BPFQ_CLR(n, p) BIT_CLR(BPFQ_BITS, n, p) -#define BPFQ_COPY(f, t) BIT_COPY(BPFQ_BITS, f, t) -#define BPFQ_ISSET(n, p) BIT_ISSET(BPFQ_BITS, n, p) -#define BPFQ_SET(n, p) BIT_SET(BPFQ_BITS, n, p) -#define BPFQ_ZERO(p) BIT_ZERO(BPFQ_BITS, p) -#define BPFQ_FILL(p) BIT_FILL(BPFQ_BITS, p) -#define BPFQ_SETOF(n, p) BIT_SETOF(BPFQ_BITS, n, p) -#define BPFQ_EMPTY(p) BIT_EMPTY(BPFQ_BITS, p) -#define BPFQ_ISFULLSET(p) BIT_ISFULLSET(BPFQ_BITS, p) -#define BPFQ_SUBSET(p, c) BIT_SUBSET(BPFQ_BITS, p, c) -#define BPFQ_OVERLAP(p, c) BIT_OVERLAP(BPFQ_BITS, p, c) -#define BPFQ_CMP(p, c) BIT_CMP(BPFQ_BITS, p, c) -#define BPFQ_OR(d, s) BIT_OR(BPFQ_BITS, d, s) -#define BPFQ_AND(d, s) BIT_AND(BPFQ_BITS, d, s) -#define BPFQ_NAND(d, s) BIT_NAND(BPFQ_BITS, d, s) -#define BPFQ_CLR_ATOMIC(n, p) BIT_CLR_ATOMIC(BPFQ_BITS, n, p) -#define BPFQ_SET_ATOMIC(n, p) BIT_SET_ATOMIC(BPFQ_BITS, n, p) -#define BPFQ_OR_ATOMIC(d, s) BIT_OR_ATOMIC(BPFQ_BITS, d, s) -#define BPFQ_COPY_STORE_REL(f, t) BIT_COPY_STORE_REL(BPFQ_BITS, f, t) -#define BPFQ_FFS(p) BIT_FFS(BPFQ_BITS, p) - /* * Descriptor associated with each open bpf file. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309031907.r83J727i046581>