From owner-svn-src-head@FreeBSD.ORG Thu Jan 9 08:55:15 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A91D8548; Thu, 9 Jan 2014 08:55:15 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12EE81CA6; Thu, 9 Jan 2014 08:55:14 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id s098tCs0091374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 9 Jan 2014 12:55:12 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id s098tCmJ091373; Thu, 9 Jan 2014 12:55:12 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 9 Jan 2014 12:55:12 +0400 From: Gleb Smirnoff To: Kevin Lo Subject: Re: svn commit: r260463 - head/sys/dev/usb/wlan Message-ID: <20140109085512.GN71033@FreeBSD.org> References: <201401090148.s091mYZx073572@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201401090148.s091mYZx073572@svn.freebsd.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2014 08:55:15 -0000 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.