Module Name: src
Committed By: christos
Date: Mon Jun 26 18:23:49 UTC 2017
Modified Files:
src/sys/dev/pci: if_vte.c
Log Message:
PR/52333: Jia-Ju Bai: explicitly pass BUS_DMA_NOWAIT to bus_dmamap_load_mbuf()
called from an interrupt context. It should not matter since the maps are
constructed with BUS_DMA_ALLOCNOW, but :-)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_vte.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.17 src/sys/dev/pci/if_vte.c:1.18
--- src/sys/dev/pci/if_vte.c:1.17 Mon May 22 22:19:14 2017
+++ src/sys/dev/pci/if_vte.c Mon Jun 26 14:23:49 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.17 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: if_vte.c,v 1.18 2017/06/26 18:23:49 christos Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.17 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.18 2017/06/26 18:23:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -733,7 +733,8 @@ vte_encap(struct vte_softc *sc, struct m
m->m_len = m->m_pkthdr.len;
}
- error = bus_dmamap_load_mbuf(sc->vte_dmatag, txd->tx_dmamap, m, 0);
+ error = bus_dmamap_load_mbuf(sc->vte_dmatag, txd->tx_dmamap, m,
+ BUS_DMA_NOWAIT);
if (error != 0) {
txd->tx_flags &= ~VTE_TXMBUF;
return (NULL);
@@ -1055,7 +1056,7 @@ vte_newbuf(struct vte_softc *sc, struct
m_adj(m, sizeof(uint32_t));
if (bus_dmamap_load_mbuf(sc->vte_dmatag,
- sc->vte_cdata.vte_rx_sparemap, m, 0) != 0) {
+ sc->vte_cdata.vte_rx_sparemap, m, BUS_DMA_NOWAIT) != 0) {
m_freem(m);
return (ENOBUFS);
}
