[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.49 (requested by thorpej...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c62ffcaa0037
branches:  netbsd-1-6
changeset: 528443:c62ffcaa0037
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jul 18 04:27:26 2002 +0000

description:
Pull up revision 1.49 (requested by thorpej in ticket #513):
Add missing BUS_DMA_NOWAIT to bus_dmamap_load_mbuf() calls. Should fix
port-alpha/17615.

diffstat:

 sys/dev/pci/if_ti.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r a2f20cc030bd -r c62ffcaa0037 sys/dev/pci/if_ti.c
--- a/sys/dev/pci/if_ti.c       Thu Jul 18 04:14:19 2002 +0000
+++ b/sys/dev/pci/if_ti.c       Thu Jul 18 04:27:26 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.47 2002/05/02 16:22:45 thorpej Exp $ */
+/* $NetBSD: if_ti.c,v 1.47.4.1 2002/07/18 04:27:26 lukem Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.47 2002/05/02 16:22:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.47.4.1 2002/07/18 04:27:26 lukem Exp $");
 
 #include "bpfilter.h"
 #include "opt_inet.h"
@@ -2292,7 +2292,7 @@
        dmamap = dma->dmamap;
 
        error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m_head,
-           BUS_DMA_WRITE);
+           BUS_DMA_WRITE | BUS_DMA_NOWAIT);
        if (error) {
                struct mbuf *m;
                int i = 0;
@@ -2399,7 +2399,7 @@
        dmamap = dma->dmamap;
 
        error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m_head,
-           BUS_DMA_WRITE);
+           BUS_DMA_WRITE | BUS_DMA_NOWAIT);
        if (error) {
                struct mbuf *m;
                int i = 0;