From owner-svn-src-head@FreeBSD.ORG  Fri Jan 10 02:48:37 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AC8B044F;
 Fri, 10 Jan 2014 02:48:37 +0000 (UTC)
Received: from ns.kevlo.org (220-135-115-6.HINET-IP.hinet.net [220.135.115.6])
 (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 55A0C1A1E;
 Fri, 10 Jan 2014 02:48:36 +0000 (UTC)
Received: from srg.kevlo.org (mail.kevlo.org [220.135.115.6])
 by ns.kevlo.org (8.14.6/8.14.6) with ESMTP id s0A2mMiO018932;
 Fri, 10 Jan 2014 10:48:24 +0800 (CST)
 (envelope-from kevlo@FreeBSD.org)
Message-ID: <52CF5F79.1070308@FreeBSD.org>
Date: Fri, 10 Jan 2014 10:48:25 +0800
From: Kevin Lo <kevlo@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.2.0
MIME-Version: 1.0
To: Gleb Smirnoff <glebius@FreeBSD.org>
Subject: Re: svn commit: r260463 - head/sys/dev/usb/wlan
References: <201401090148.s091mYZx073572@svn.freebsd.org>
 <20140109085512.GN71033@FreeBSD.org>
In-Reply-To: <20140109085512.GN71033@FreeBSD.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2014 02:48:37 -0000

On 2014/01/09 16:55, Gleb Smirnoff wrote:
> 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.

Fixed in r260501.  Thanks.

     Kevin