From owner-svn-src-head@FreeBSD.ORG  Sun Nov  9 01:53:06 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A23D1065670;
	Sun,  9 Nov 2008 01:53:06 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A2CC8FC12;
	Sun,  9 Nov 2008 01:53:06 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA91r6eL027363;
	Sun, 9 Nov 2008 01:53:06 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA91r6b9027362;
	Sun, 9 Nov 2008 01:53:06 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811090153.mA91r6b9027362@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 9 Nov 2008 01:53:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184778 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Nov 2008 01:53:06 -0000

Author: kmacy
Date: Sun Nov  9 01:53:06 2008
New Revision: 184778
URL: http://svn.freebsd.org/changeset/base/184778

Log:
  make kern.ipc.nmbclusters actually have a useful effect on nmbclusters et al.
  initialize pkthdr in field order

Modified:
  head/sys/kern/kern_mbuf.c

Modified: head/sys/kern/kern_mbuf.c
==============================================================================
--- head/sys/kern/kern_mbuf.c	Sun Nov  9 01:10:21 2008	(r184777)
+++ head/sys/kern/kern_mbuf.c	Sun Nov  9 01:53:06 2008	(r184778)
@@ -104,13 +104,14 @@ struct mbstat mbstat;
 static void
 tunable_mbinit(void *dummy)
 {
+	TUNABLE_INT_FETCH("kern.ipc.nmbclusters", &nmbclusters);
 
 	/* This has to be done before VM init. */
-	nmbclusters = 1024 + maxusers * 64;
+	if (nmbclusters == 0)
+		nmbclusters = 1024 + maxusers * 64;
 	nmbjumbop = nmbclusters / 2;
 	nmbjumbo9 = nmbjumbop / 2;
 	nmbjumbo16 = nmbjumbo9 / 2;
-	TUNABLE_INT_FETCH("kern.ipc.nmbclusters", &nmbclusters);
 }
 SYSINIT(tunable_mbinit, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_mbinit, NULL);
 
@@ -409,8 +410,8 @@ mb_ctor_mbuf(void *mem, int size, void *
 	if (flags & M_PKTHDR) {
 		m->m_data = m->m_pktdat;
 		m->m_pkthdr.rcvif = NULL;
-		m->m_pkthdr.len = 0;
 		m->m_pkthdr.header = NULL;
+		m->m_pkthdr.len = 0;
 		m->m_pkthdr.csum_flags = 0;
 		m->m_pkthdr.csum_data = 0;
 		m->m_pkthdr.tso_segsz = 0;