Date: Thu, 9 Jan 2014 12:55:12 +0400 From: Gleb Smirnoff <glebius@FreeBSD.org> To: Kevin Lo <kevlo@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r260463 - head/sys/dev/usb/wlan Message-ID: <20140109085512.GN71033@FreeBSD.org> In-Reply-To: <201401090148.s091mYZx073572@svn.freebsd.org> References: <201401090148.s091mYZx073572@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Jan 09, 2014 at 01:48:34AM +0000, Kevin Lo wrote: K> Author: kevlo K> Date: Thu Jan 9 01:48:33 2014 K> New Revision: 260463 K> URL: http://svnweb.freebsd.org/changeset/base/260463 K> K> Log: K> Replace deprecated M_DONTWAIT with M_NOWAIT. K> K> Modified: K> head/sys/dev/usb/wlan/if_rsu.c K> head/sys/dev/usb/wlan/if_urtwn.c K> K> Modified: head/sys/dev/usb/wlan/if_rsu.c K> ============================================================================== K> --- head/sys/dev/usb/wlan/if_rsu.c Thu Jan 9 00:59:03 2014 (r260462) K> +++ head/sys/dev/usb/wlan/if_rsu.c Thu Jan 9 01:48:33 2014 (r260463) K> @@ -1145,11 +1145,11 @@ rsu_event_survey(struct rsu_softc *sc, u K> pktlen = sizeof(*wh) + le32toh(bss->ieslen); K> if (__predict_false(pktlen > MCLBYTES)) K> return; K> - MGETHDR(m, M_DONTWAIT, MT_DATA); K> + MGETHDR(m, M_NOWAIT, MT_DATA); K> if (__predict_false(m == NULL)) K> return; K> if (pktlen > MHLEN) { K> - MCLGET(m, M_DONTWAIT); K> + MCLGET(m, M_NOWAIT); K> if (!(m->m_flags & M_EXT)) { K> m_free(m); K> return; K> @@ -1358,13 +1358,13 @@ rsu_rx_frame(struct rsu_softc *sc, uint8 K> DPRINTFN(5, "Rx frame len=%d rate=%d infosz=%d rssi=%d\n", K> pktlen, rate, infosz, *rssi); K> K> - MGETHDR(m, M_DONTWAIT, MT_DATA); K> + MGETHDR(m, M_NOWAIT, MT_DATA); K> if (__predict_false(m == NULL)) { K> ifp->if_ierrors++; K> return NULL; K> } K> if (pktlen > MHLEN) { K> - MCLGET(m, M_DONTWAIT); K> + MCLGET(m, M_NOWAIT); K> if (__predict_false(!(m->m_flags & M_EXT))) { K> ifp->if_ierrors++; K> m_freem(m); Thanks! The macros MGETHDR, MCLGET should also be converted to functions. -- Totus tuus, Glebius.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140109085512.GN71033>