d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure to copy segments back to the segs array if non-NULL. This is

Browse Source 
relied upon by bus_dmamap_load_mbuf_sg() (i.e. all network drivers).

Approved by:	re (kib)
MFC after:	2 weeks
This commit is contained in:
nwhitehorn 2013-09-17 17:29:07 +00:00
parent 16db26f84b
commit df676be3eb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/powerpc/powerpc/busdma_machdep.c
View File

@ -847,13 +847,16 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
map->nsegs = nsegs; map->nsegs = nsegs;
if (segs != NULL) if (segs != NULL)
memcpy(map->segments, segs, map->nsegs*sizeof(segs[0])); memcpy(map->segments, segs, map->nsegs*sizeof(segs[0]));
else
segs = map->segments;
if (dmat->iommu != NULL) if (dmat->iommu != NULL)
IOMMU_MAP(dmat->iommu, map->segments, &map->nsegs, IOMMU_MAP(dmat->iommu, map->segments, &map->nsegs,
dmat->lowaddr, dmat->highaddr, dmat->alignment, dmat->lowaddr, dmat->highaddr, dmat->alignment,
dmat->boundary, dmat->iommu_cookie); dmat->boundary, dmat->iommu_cookie);
if (segs != NULL)
memcpy(segs, map->segments, map->nsegs*sizeof(segs[0]));
else
segs = map->segments;
return (segs); return (segs);
} }