From 3690d03377142839812b5b9e2b96e02098062a1e Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 11 Jul 2002 04:15:53 +0000 Subject: [PATCH] Move the MSIZE and MCLSHIFT options out of the undocumented section in NOTES. Add some comments about the potential problems associated with NIC driver modules and changing these options. Fix sorting problems in sys/conf/options with the MSIZE and MCLSHIFT options. Reviewed by: bde --- sys/conf/NOTES | 11 +++++++++-- sys/conf/options | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 4aeb7a468a88..d450040b2a32 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1684,6 +1684,15 @@ device fpa 1 # only works for Tigon II chips, and has no effect for Tigon I chips. options TI_JUMBO_HDRSPLIT +# These two options allow manipulating the mbuf cluster size and mbuf size, +# respectively. Be very careful with NIC driver modules when changing +# these from their default values, because that can potentially cause a +# mismatch between the mbuf size assumed by the kernel and the mbuf size +# assumed by a module. The only driver that currently has the ability to +# detect a mismatch is ti(4). +options MCLSHIFT=12 # mbuf cluster shift in bits, 12 == 4KB +options MSIZE=512 # mbuf size in bytes + # # ATM related options (Cranor version) # (note: this driver cannot be used with the HARP ATM stack) @@ -2269,8 +2278,6 @@ options MSGTQL=41 # Max number of messages in system options NBUF=512 # Number of buffer headers -options MSIZE=256 # mbuf size in bytes -options MCLSHIFT=12 # mbuf cluster shift in bits, 12 == 4KB options NMBCLUSTERS=1024 # Number of mbuf clusters options SCSI_NCR_DEBUG diff --git a/sys/conf/options b/sys/conf/options index b9ae0311c9c5..ef34058c62ce 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -407,11 +407,11 @@ DIAGNOSTIC opt_global.h ENABLE_VFS_IOOPT opt_global.h INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h +MCLSHIFT opt_global.h +MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h VFS_BIO_DEBUG opt_global.h -MSIZE opt_global.h -MCLSHIFT opt_global.h # These are VM related options VM_KMEM_SIZE opt_vm.h