diff options
| author | kevlo <kevlo@FreeBSD.org> | 2014-02-17 01:39:03 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2014-02-17 01:39:03 +0000 |
| commit | 5da395405c188ee127a56d59caae66640d6e78e9 (patch) | |
| tree | eb5c442f234ebf79f9f909cc7f4768078ae040ef | |
| parent | ecbaab7887ad759827a12115b1111cfa50a6f092 (diff) | |
| download | FreeBSD-src-5da395405c188ee127a56d59caae66640d6e78e9.zip FreeBSD-src-5da395405c188ee127a56d59caae66640d6e78e9.tar.gz | |
MFC r260463:
Replace deprecated M_DONTWAIT with M_NOWAIT.
| -rw-r--r-- | sys/dev/usb/wlan/if_rsu.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_urtwn.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index 97e66f3..5887821 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -1144,11 +1144,11 @@ rsu_event_survey(struct rsu_softc *sc, uint8_t *buf, int len) pktlen = sizeof(*wh) + le32toh(bss->ieslen); if (__predict_false(pktlen > MCLBYTES)) return; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (__predict_false(m == NULL)) return; if (pktlen > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, M_NOWAIT); if (!(m->m_flags & M_EXT)) { m_free(m); return; @@ -1357,13 +1357,13 @@ rsu_rx_frame(struct rsu_softc *sc, uint8_t *buf, int pktlen, int *rssi) DPRINTFN(5, "Rx frame len=%d rate=%d infosz=%d rssi=%d\n", pktlen, rate, infosz, *rssi); - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (__predict_false(m == NULL)) { ifp->if_ierrors++; return NULL; } if (pktlen > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, M_NOWAIT); if (__predict_false(!(m->m_flags & M_EXT))) { ifp->if_ierrors++; m_freem(m); diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c index 876f73f..2fa66f4 100644 --- a/sys/dev/usb/wlan/if_urtwn.c +++ b/sys/dev/usb/wlan/if_urtwn.c @@ -625,7 +625,7 @@ urtwn_rx_frame(struct urtwn_softc *sc, uint8_t *buf, int pktlen, int *rssi_p) rssi = URTWN_RSSI(rssi); } - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); if (m == NULL) { device_printf(sc->sc_dev, "could not create RX mbuf\n"); return (NULL); |
