svn commit: r262008 - stable/10/sys/dev/usb/wlan

[Kevin Lo]

Author: kevlo
Date: Mon Feb 17 01:39:03 2014
New Revision: 262008
URL: http://svnweb.freebsd.org/changeset/base/262008

Log:
  MFC r260463:
  
  Replace deprecated M_DONTWAIT with M_NOWAIT.

Modified:
  stable/10/sys/dev/usb/wlan/if_rsu.c
  stable/10/sys/dev/usb/wlan/if_urtwn.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/wlan/if_rsu.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_rsu.c	Mon Feb 17 01:36:53 2014	(r262007)
+++ stable/10/sys/dev/usb/wlan/if_rsu.c	Mon Feb 17 01:39:03 2014	(r262008)
@@ -1144,11 +1144,11 @@ rsu_event_survey(struct rsu_softc *sc, u
 	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
 	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);

Modified: stable/10/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_urtwn.c	Mon Feb 17 01:36:53 2014	(r262007)
+++ stable/10/sys/dev/usb/wlan/if_urtwn.c	Mon Feb 17 01:39:03 2014	(r262008)
@@ -625,7 +625,7 @@ urtwn_rx_frame(struct urtwn_softc *sc, u
 		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);