From owner-svn-src-all@FreeBSD.ORG  Sat Jun  1 11:42:48 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 27FC7B64;
 Sat,  1 Jun 2013 11:42:48 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1AD60C47;
 Sat,  1 Jun 2013 11:42:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r51Bglcm070028;
 Sat, 1 Jun 2013 11:42:47 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r51BglSK070027;
 Sat, 1 Jun 2013 11:42:47 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201306011142.r51BglSK070027@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 1 Jun 2013 11:42:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251221 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Jun 2013 11:42:48 -0000

Author: marius
Date: Sat Jun  1 11:42:47 2013
New Revision: 251221
URL: http://svnweb.freebsd.org/changeset/base/251221

Log:
  Move an assertion to the right spot; only bus_dmamap_load_mbuf(9)
  requires a pkthdr being present but that's not the case for either
  _bus_dmamap_load_mbuf_sg() or bus_dmamap_load_mbuf_sg(9).
  
  Reported by:	sbruno
  MFC after:	1 week

Modified:
  head/sys/kern/subr_bus_dma.c

Modified: head/sys/kern/subr_bus_dma.c
==============================================================================
--- head/sys/kern/subr_bus_dma.c	Sat Jun  1 11:31:09 2013	(r251220)
+++ head/sys/kern/subr_bus_dma.c	Sat Jun  1 11:42:47 2013	(r251221)
@@ -104,8 +104,6 @@ _bus_dmamap_load_mbuf_sg(bus_dma_tag_t d
 	struct mbuf *m;
 	int error;
 
-	M_ASSERTPKTHDR(m0);
-
 	error = 0;
 	for (m = m0; m != NULL && error == 0; m = m->m_next) {
 		if (m->m_len > 0) {
@@ -323,6 +321,8 @@ bus_dmamap_load_mbuf(bus_dma_tag_t dmat,
 	bus_dma_segment_t *segs;
 	int nsegs, error;
 
+	M_ASSERTPKTHDR(m0);
+
 	flags |= BUS_DMA_NOWAIT;
 	nsegs = -1;
 	error = _bus_dmamap_load_mbuf_sg(dmat, map, m0, NULL, &nsegs, flags);