diff options
-rw-r--r-- | sys/alpha/include/param.h | 14 | ||||
-rw-r--r-- | sys/i386/include/param.h | 10 | ||||
-rw-r--r-- | sys/ia64/include/param.h | 14 |
3 files changed, 15 insertions, 23 deletions
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h index 28bef01..efd4efe 100644 --- a/sys/alpha/include/param.h +++ b/sys/alpha/include/param.h @@ -120,18 +120,16 @@ /* * Constants related to network buffer management. - * MCLBYTES must be no larger than CLBYTES (the software page size), and, - * on machines that exchange pages of input or output buffers with mbuf - * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple - * of the hardware page size. + * MCLBYTES must be no larger than PAGE_SIZE. */ +#ifndef MSIZE #define MSIZE 256 /* size of an mbuf */ +#endif /* MSIZE */ + #ifndef MCLSHIFT -# define MCLSHIFT 11 /* convert bytes to m_buf clusters */ - /* 2K cluster can hold Ether frame */ +#define MCLSHIFT 11 /* convert bytes to mbuf clusters */ #endif /* MCLSHIFT */ -#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ -#define MCLOFSET (MCLBYTES - 1) +#define MCLBYTES (1 << MCLSHIFT) /* size of a mbuf cluster */ /* pages ("clicks") to disk blocks */ #define ctod(x) ((x) << (PAGE_SHIFT - DEV_BSHIFT)) diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index cc6d991..bac527e 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -102,20 +102,16 @@ /* * Constants related to network buffer management. - * MCLBYTES must be no larger than CLBYTES (the software page size), and, - * on machines that exchange pages of input or output buffers with mbuf - * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple - * of the hardware page size. + * MCLBYTES must be no larger than PAGE_SIZE. */ #ifndef MSIZE #define MSIZE 256 /* size of an mbuf */ #endif /* MSIZE */ #ifndef MCLSHIFT -#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ +#define MCLSHIFT 11 /* convert bytes to mbuf clusters */ #endif /* MCLSHIFT */ -#define MCLBYTES (1 << MCLSHIFT) /* size of an m_buf cluster */ -#define MCLOFSET (MCLBYTES - 1) /* offset within an m_buf cluster */ +#define MCLBYTES (1 << MCLSHIFT) /* size of an mbuf cluster */ /* * Some macros for units conversion diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h index d67a0fc..577356a 100644 --- a/sys/ia64/include/param.h +++ b/sys/ia64/include/param.h @@ -116,18 +116,16 @@ /* * Constants related to network buffer management. - * MCLBYTES must be no larger than CLBYTES (the software page size), and, - * on machines that exchange pages of input or output buffers with mbuf - * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple - * of the hardware page size. + * MCLBYTES must be no larger than PAGE_SIZE. */ +#ifndef MSIZE #define MSIZE 256 /* size of an mbuf */ +#endif /* MSIZE */ + #ifndef MCLSHIFT -# define MCLSHIFT 11 /* convert bytes to m_buf clusters */ - /* 2K cluster can hold Ether frame */ +#define MCLSHIFT 11 /* convert bytes to mbuf clusters */ #endif /* MCLSHIFT */ -#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ -#define MCLOFSET (MCLBYTES - 1) +#define MCLBYTES (1 << MCLSHIFT) /* size of a mbuf cluster */ /* * Size of kernel malloc arena in CLBYTES-sized logical pages |