svn commit: r255639 - head/sys/powerpc/powerpc

[Nathan Whitehorn]

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);
 }