aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/wpi
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2012-12-04 09:32:43 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2012-12-04 09:32:43 +0000
commitc6499eccad497913a5025fbde8ae76da70e08043 (patch)
tree30c414dead3eba042cad7b6cbb32d1c9cba96149 /sys/dev/wpi
parent8ca5c3fae7d077e4e6460a251160585709f6e37e (diff)
downloadsrc-c6499eccad497913a5025fbde8ae76da70e08043.tar.gz
src-c6499eccad497913a5025fbde8ae76da70e08043.zip
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags in sys/dev.
Notes
Notes: svn path=/head/; revision=243857
Diffstat (limited to 'sys/dev/wpi')
-rw-r--r--sys/dev/wpi/if_wpi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 365e03e4d36e..465c140d1d86 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -989,7 +989,7 @@ wpi_alloc_rx_ring(struct wpi_softc *sc, struct wpi_rx_ring *ring)
__func__, error);
goto fail;
}
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
if (m == NULL) {
device_printf(sc->sc_dev,
"%s: could not allocate rx mbuf\n", __func__);
@@ -1493,7 +1493,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
}
/* XXX don't need mbuf, just dma buffer */
- mnew = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+ mnew = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
if (mnew == NULL) {
DPRINTFN(WPI_DEBUG_RX, ("%s: no mbuf to restock ring\n",
__func__));
@@ -1975,7 +1975,7 @@ wpi_tx_data(struct wpi_softc *sc, struct mbuf *m0, struct ieee80211_node *ni,
}
if (error != 0) {
/* XXX use m_collapse */
- mnew = m_defrag(m0, M_DONTWAIT);
+ mnew = m_defrag(m0, M_NOWAIT);
if (mnew == NULL) {
device_printf(sc->sc_dev,
"could not defragment mbuf\n");
@@ -2575,7 +2575,7 @@ wpi_scan(struct wpi_softc *sc)
desc = &ring->desc[ring->cur];
data = &ring->data[ring->cur];
- data->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (data->m == NULL) {
device_printf(sc->sc_dev,
"could not allocate mbuf for scan command\n");