From e916d96e6441d032eb48dbe3965cc240c4b469d7 Mon Sep 17 00:00:00 2001
From: Jesper Skriver <jesper@FreeBSD.org>
Date: Thu, 31 May 2001 21:56:44 +0000
Subject: [PATCH] Move the definition of NMBCLUSTERS from
 src/sys/kern/uipc_mbuf.c to <sys/param.h>, so it's available to
 src/sys/netinet/ip_input.c, and remove the now unneeded includes of
 "opt_param.h".

MFC after:	1 week
---
 sys/kern/uipc_accf.c    | 1 -
 sys/kern/uipc_mbuf.c    | 5 -----
 sys/kern/uipc_sockbuf.c | 1 -
 sys/kern/uipc_socket2.c | 1 -
 4 files changed, 8 deletions(-)

diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index b31026af3b68..6a8903cbacf5 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -29,7 +29,6 @@
 
 #define ACCEPT_FILTER_MOD
 
-#include "opt_param.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domain.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 1cabff7d9e50..61067a45b069 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -34,7 +34,6 @@
  * $FreeBSD$
  */
 
-#include "opt_param.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/condvar.h>
@@ -99,10 +98,6 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, nmbufs, CTLFLAG_RD, &nmbufs, 0,
 SYSCTL_INT(_kern_ipc, OID_AUTO, nmbcnt, CTLFLAG_RD, &nmbcnt, 0,
 	   "Maximum number of ext_buf counters available");
 
-#ifndef NMBCLUSTERS
-#define NMBCLUSTERS	(512 + MAXUSERS * 16)
-#endif
-
 TUNABLE_INT_DECL("kern.ipc.nmbclusters", NMBCLUSTERS, nmbclusters);
 TUNABLE_INT_DECL("kern.ipc.nmbufs", NMBCLUSTERS * 4, nmbufs);
 TUNABLE_INT_DECL("kern.ipc.nmbcnt", EXT_COUNTERS, nmbcnt);
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 9b23c859fd82..fa55d3e80011 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -34,7 +34,6 @@
  * $FreeBSD$
  */
 
-#include "opt_param.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domain.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 9b23c859fd82..fa55d3e80011 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -34,7 +34,6 @@
  * $FreeBSD$
  */
 
-#include "opt_param.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domain.h>