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

Move an assertion to the right spot; only bus_dmamap_load_mbuf(9)

Browse Source 
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
This commit is contained in:
Marius Strobl 2013-06-01 11:42:47 +00:00
parent f112d4f8b7
commit 0ad17e4b32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/subr_bus_dma.c
View File

@ -104,8 +104,6 @@ _bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map,
struct mbuf *m; struct mbuf *m;
int error; int error;
M_ASSERTPKTHDR(m0);
error = 0; error = 0;
for (m = m0; m != NULL && error == 0; m = m->m_next) { for (m = m0; m != NULL && error == 0; m = m->m_next) {
if (m->m_len > 0) { if (m->m_len > 0) {
@ -323,6 +321,8 @@ bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, struct mbuf *m0,
bus_dma_segment_t *segs; bus_dma_segment_t *segs;
int nsegs, error; int nsegs, error;
M_ASSERTPKTHDR(m0);
flags |= BUS_DMA_NOWAIT; flags |= BUS_DMA_NOWAIT;
nsegs = -1; nsegs = -1;
error = _bus_dmamap_load_mbuf_sg(dmat, map, m0, NULL, &nsegs, flags); error = _bus_dmamap_load_mbuf_sg(dmat, map, m0, NULL, &nsegs, flags);