summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2008-11-25 15:43:33 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2008-11-25 15:43:33 +0000
commit7c5970b40646af097446ecad1a36f2def9599857 (patch)
tree9d2877db7674007a11674d3181879d3a8a70b9a4
parent8a47c75221bb2302bcd8a1fabaefcdbdc38a88dc (diff)
art says he doesnt suck anymore, so enable the really big cluster
allocators again.
-rw-r--r--sys/kern/uipc_mbuf.c6
-rw-r--r--sys/net/if.c4
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index c430471239e..61beade8133 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.100 2008/11/25 12:47:00 deraadt Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.101 2008/11/25 15:43:32 dlg Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -96,16 +96,14 @@ struct mbstat mbstat; /* mbuf stats */
struct pool mbpool; /* mbuf pool */
/* mbuf cluster pools */
-u_short mclsizes[] = {
+u_int mclsizes[] = {
MCLBYTES, /* must be at slot 0 */
4 * 1024,
-#if art_doesnt_suck
8 * 1024,
9 * 1024,
12 * 1024,
16 * 1024,
64 * 1024
-#endif
};
static char mclnames[MCLPOOLS][8];
struct pool mclpools[MCLPOOLS];
diff --git a/sys/net/if.c b/sys/net/if.c
index 0e21bdfc88e..91e1905f352 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.179 2008/11/25 12:47:00 deraadt Exp $ */
+/* $OpenBSD: if.c,v 1.180 2008/11/25 15:43:32 dlg Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -2019,7 +2019,7 @@ sysctl_ifq(int *name, u_int namelen, void *oldp, size_t *oldlenp,
void
m_clinitifp(struct ifnet *ifp)
{
- extern u_short mclsizes[];
+ extern u_int mclsizes[];
int i;
/* Initialize high water marks for use of cluster pools */