From owner-svn-src-user@FreeBSD.ORG Tue Sep 3 19:07:02 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BCE76394; Tue, 3 Sep 2013 19:07:02 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A82902F98; Tue, 3 Sep 2013 19:07:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r83J72Db046583; Tue, 3 Sep 2013 19:07:02 GMT (envelope-from syuu@svn.freebsd.org) Received: (from syuu@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r83J727i046581; Tue, 3 Sep 2013 19:07:02 GMT (envelope-from syuu@svn.freebsd.org) Message-Id: <201309031907.r83J727i046581@svn.freebsd.org> From: Takuya ASADA Date: Tue, 3 Sep 2013 19:07:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r255189 - user/syuu/mq_bpf/sys/net X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Sep 2013 19:07:02 -0000 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 + /* 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 -#include -#include - -#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 #include #include -#include -#include #include - -#define BPFQ_BITS 256 -BITSET_DEFINE(bpf_qmask_bits, BPFQ_BITS); +#include 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. */