summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2014-03-25 06:55:53 +0000
committermm <mm@FreeBSD.org>2014-03-25 06:55:53 +0000
commitc4f653f608db7cd433d722ed01d856823c2c42ea (patch)
treef3de797ffeec6f7d8309836f934e8db6c7271c6d /sys/net
parentff55131045511eda1a31eabb4cf1dff3a75bf31a (diff)
downloadFreeBSD-src-c4f653f608db7cd433d722ed01d856823c2c42ea.zip
FreeBSD-src-c4f653f608db7cd433d722ed01d856823c2c42ea.tar.gz
Merge from projects/pf r251993 (glebius@):
De-vnet hash sizes and hash masks. Submitted by: Nikos Vassiliadis <nvass gmx.com> Reviewed by: trociny MFC after: 1 month
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/pfvar.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index b7fbf5f..2c25931 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1488,19 +1488,17 @@ struct pf_idhash {
struct mtx lock;
};
+extern u_long pf_hashmask;
+extern u_long pf_srchashmask;
#define PF_HASHSIZ (32768)
VNET_DECLARE(struct pf_keyhash *, pf_keyhash);
VNET_DECLARE(struct pf_idhash *, pf_idhash);
-VNET_DECLARE(u_long, pf_hashmask);
#define V_pf_keyhash VNET(pf_keyhash)
#define V_pf_idhash VNET(pf_idhash)
-#define V_pf_hashmask VNET(pf_hashmask)
VNET_DECLARE(struct pf_srchash *, pf_srchash);
-VNET_DECLARE(u_long, pf_srchashmask);
#define V_pf_srchash VNET(pf_srchash)
-#define V_pf_srchashmask VNET(pf_srchashmask)
-#define PF_IDHASH(s) (be64toh((s)->id) % (V_pf_hashmask + 1))
+#define PF_IDHASH(s) (be64toh((s)->id) % (pf_hashmask + 1))
VNET_DECLARE(void *, pf_swi_cookie);
#define V_pf_swi_cookie VNET(pf_swi_cookie)
OpenPOWER on IntegriCloud