Date: Wed, 16 Sep 2015 15:27:47 +0800 From: Kevin Lo <kevlo@FreeBSD.org> To: Mateusz Guzik <mjguzik@gmail.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r287852 - head/sys/dev/usb/wlan Message-ID: <20150916072747.GA30042@ns.kevlo.org> In-Reply-To: <20150916072002.GA32476@dft-labs.eu> References: <201509160716.t8G7GM9v047729@repo.freebsd.org> <20150916072002.GA32476@dft-labs.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Sep 16, 2015 at 09:20:02AM +0200, Mateusz Guzik wrote: > On Wed, Sep 16, 2015 at 07:16:22AM +0000, Kevin Lo wrote: > > Author: kevlo > > Date: Wed Sep 16 07:16:21 2015 > > New Revision: 287852 > > URL: https://svnweb.freebsd.org/changeset/base/287852 > > > > Log: > > Remove checks for a NULL return value from M_WAITOK allocations. > > > > Modified: > > head/sys/dev/usb/wlan/if_ural.c > > > > Modified: head/sys/dev/usb/wlan/if_ural.c > > ============================================================================== > > --- head/sys/dev/usb/wlan/if_ural.c Wed Sep 16 06:23:15 2015 (r287851) > > +++ head/sys/dev/usb/wlan/if_ural.c Wed Sep 16 07:16:21 2015 (r287852) > > @@ -566,10 +566,7 @@ ural_vap_create(struct ieee80211com *ic, > > > > if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ > > return NULL; > > - uvp = (struct ural_vap *) malloc(sizeof(struct ural_vap), > > - M_80211_VAP, M_NOWAIT | M_ZERO); > > - if (uvp == NULL) > > - return NULL; > > + uvp = malloc(sizeof(struct ural_vap), M_80211_VAP, M_NOWAIT | M_ZERO); > > vap = &uvp->vap; > > /* enable s/w bmiss handling for sta mode */ > > > > > > This looks like M_NOWAIT prior to and after the commit. > > I have no idea if the context here allows sleeping though. Thanks for spotting this out. This functionality is not used within interrupt context, so we could use M_WAITOK to allocate memory. > > -- > Mateusz Guzik <mjguzik gmail.com> Kevin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150916072747.GA30042>