summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandre <andre@FreeBSD.org>2005-12-10 15:21:04 +0000
committerandre <andre@FreeBSD.org>2005-12-10 15:21:04 +0000
commit5751cf9192c266bdb9e8ff37a29d7494a8c5bf65 (patch)
tree2d5517126202209556a97283315db0d4cc25a471
parentb7b8dddecbe6aaaa72b5ec0e9571be7c4bd6ba7a (diff)
downloadFreeBSD-src-5751cf9192c266bdb9e8ff37a29d7494a8c5bf65.zip
FreeBSD-src-5751cf9192c266bdb9e8ff37a29d7494a8c5bf65.tar.gz
Hide the 4k mbuf clusters if the normal clusters are defined to be
4k already. This unbreaks tinderbox. Submitted by: ru
-rw-r--r--sys/kern/kern_mbuf.c2
-rw-r--r--sys/sys/mbuf.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 2ac069b..e9e43b8 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -378,9 +378,11 @@ mb_ctor_clust(void *mem, int size, void *arg, int how)
case MCLBYTES:
type = EXT_CLUSTER;
break;
+#if MJUM4BYTES != MCLBYTES
case MJUM4BYTES:
type = EXT_JUMBO4;
break;
+#endif
case MJUM9BYTES:
type = EXT_JUMBO9;
break;
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 05a4b9a..878a6cd 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -421,9 +421,11 @@ m_getjcl(int how, short type, int flags, int size)
case MCLBYTES:
zone = zone_clust;
break;
+#if MJUM4BYTES != MCLBYTES
case MJUM4BYTES:
zone = zone_jumbo4;
break;
+#endif
case MJUM9BYTES:
zone = zone_jumbo9;
break;
@@ -485,9 +487,11 @@ m_cljget(struct mbuf *m, int how, int size)
case MCLBYTES:
zone = zone_clust;
break;
+#if MJUM4BYTES != MCLBYTES
case MJUM4BYTES:
zone = zone_jumbo4;
break;
+#endif
case MJUM9BYTES:
zone = zone_jumbo9;
break;
OpenPOWER on IntegriCloud