Index: uipc_mbuf.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.207
diff -u -p -r1.207 uipc_mbuf.c
--- uipc_mbuf.c	14 Aug 2015 05:25:29 -0000	1.207
+++ uipc_mbuf.c	27 Sep 2015 02:59:55 -0000
@@ -125,8 +125,8 @@ void	nmbclust_update(void);
 void	m_zero(struct mbuf *);
 
 
-const char *mclpool_warnmsg =
-    "WARNING: mclpools limit reached; increase kern.maxclusters";
+const char *mbufpl_warnmsg =
+    "WARNING: mbuf limit reached; increase kern.maxclusters";
 
 /*
  * Initialize the mbuf allocator.
@@ -159,7 +159,6 @@ mbinit(void)
 		    mclnames[i], NULL);
 		pool_setipl(&mclpools[i], IPL_NET);
 		pool_set_constraints(&mclpools[i], &kp_dma_contig);
-		pool_setlowat(&mclpools[i], mcllowat);
 	}
 
 	nmbclust_update();
@@ -168,25 +167,7 @@ mbinit(void)
 void
 nmbclust_update(void)
 {
-	int i;
-	/*
-	 * Set the hard limit on the mclpools to the number of
-	 * mbuf clusters the kernel is to support.  Log the limit
-	 * reached message max once a minute.
-	 */
-	for (i = 0; i < nitems(mclsizes); i++) {
-		(void)pool_sethardlimit(&mclpools[i], nmbclust,
-		    mclpool_warnmsg, 60);
-		/*
-		 * XXX this needs to be reconsidered.
-		 * Setting the high water mark to nmbclust is too high
-		 * but we need to have enough spare buffers around so that
-		 * allocations in interrupt context don't fail or mclgeti()
-		 * drivers may end up with empty rings.
-		 */
-		pool_sethiwat(&mclpools[i], nmbclust);
-	}
-	pool_sethiwat(&mbpool, nmbclust);
+	(void)pool_sethardlimit(&mbpool, nmbclust, mbufpl_warnmsg, 60);
 }
 
 /*