Use the default arguments for lockfunc and lockfuncarg in

bus_dma_tag_create. We need to be sure that our packets are
kept in-sequence (that's how ATM is supposed to work) and
therefor use BUS_DMA_NOWAIT in all calls to bus_dmamap_load.

For memory allocated with bus_dmamem_alloc the use of anything
other than NULL arguments for the locking is anyway bogus because
this memory never should need bouncing and hence the load should never
be defered.

Allow the receipt of OAM and RM cells on raw connections. Caveat: it seems
that RM cells are still processed by the hardware even when we open the
connection as UBR.

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index 35edf0c16527..2d93e3bd2efb 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -150,7 +150,7 @@ hatm_mbuf_page_alloc(struct hatm_softc *sc, u_int group)
 		return;
 	}
 	err = bus_dmamap_load(sc->mbuf_tag, pg->hdr.map, pg, MBUF_ALLOC_SIZE,
-	    hatm_extbuf_helper, &pg->hdr.phys, 0);
+	    hatm_extbuf_helper, &pg->hdr.phys, BUS_DMA_NOWAIT);
 	if (err != 0) {
 		if_printf(&sc->ifatm.ifnet, "%s -- mbuf mapping failed %d\n",
 		    __func__, err);
@@ -342,7 +342,7 @@ he_intr_rbp(struct hatm_softc *sc, struct herbp *rbp, u_int large,
 			if ((error = bus_dmamap_load(sc->mbuf_tag,
 			    sc->rmaps[sc->lbufs_next],
 			    m->m_data, rbp->bsize, hatm_mbuf_helper,
-			    &rbp->rbp[rbp->tail].phys, 0)) != NULL)
+			    &rbp->rbp[rbp->tail].phys, BUS_DMA_NOWAIT)) != NULL)
 				panic("hatm: mbuf mapping failed %d", error);
 
 			bus_dmamap_sync(sc->mbuf_tag,