From owner-svn-src-head@FreeBSD.ORG  Tue Sep 17 17:29:07 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E9FF2D99;
 Tue, 17 Sep 2013 17:29:07 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D5EFA2538;
 Tue, 17 Sep 2013 17:29:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HHT7GA076414;
 Tue, 17 Sep 2013 17:29:07 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HHT79t076413;
 Tue, 17 Sep 2013 17:29:07 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201309171729.r8HHT79t076413@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 17 Sep 2013 17:29:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255639 - head/sys/powerpc/powerpc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 17 Sep 2013 17:29:08 -0000

Author: nwhitehorn
Date: Tue Sep 17 17:29:07 2013
New Revision: 255639
URL: http://svnweb.freebsd.org/changeset/base/255639

Log:
  Make sure to copy segments back to the segs array if non-NULL. This is
  relied upon by bus_dmamap_load_mbuf_sg() (i.e. all network drivers).
  
  Approved by:	re (kib)
  MFC after:	2 weeks

Modified:
  head/sys/powerpc/powerpc/busdma_machdep.c

Modified: head/sys/powerpc/powerpc/busdma_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/busdma_machdep.c	Tue Sep 17 16:06:07 2013	(r255638)
+++ head/sys/powerpc/powerpc/busdma_machdep.c	Tue Sep 17 17:29:07 2013	(r255639)
@@ -847,13 +847,16 @@ _bus_dmamap_complete(bus_dma_tag_t dmat,
 	map->nsegs = nsegs;
 	if (segs != NULL)
 		memcpy(map->segments, segs, map->nsegs*sizeof(segs[0]));
-	else
-		segs = map->segments;
 	if (dmat->iommu != NULL)
 		IOMMU_MAP(dmat->iommu, map->segments, &map->nsegs,
 		    dmat->lowaddr, dmat->highaddr, dmat->alignment,
 		    dmat->boundary, dmat->iommu_cookie);
 
+	if (segs != NULL)
+		memcpy(segs, map->segments, map->nsegs*sizeof(segs[0]));
+	else
+		segs = map->segments;
+
 	return (segs);
 }