Date: Sat, 2 Feb 2019 09:43:31 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Andriy Voskoboinyk <avos@freebsd.org> Cc: rgrimes@freebsd.org, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r343682 - head/sys/dev/wtap Message-ID: <201902021743.x12HhVRH028585@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <op.zwlhkxwt4dikkl@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
> Sat, 02 Feb 2019 19:25:56 +0200 ???? ???????? Rodney W. Grimes > <freebsd@pdx.rh.cn85.dnsmgr.net>: > > >> Author: avos > >> Date: Sat Feb 2 16:15:46 2019 > >> New Revision: 343682 > >> URL: https://svnweb.freebsd.org/changeset/base/343682 > >> > >> Log: > >> sys/dev/wtap: Check return value from malloc(..., M_NOWAIT) and > >> drop unneeded cast. > >> > >> MFC after: 3 days > >> > >> Modified: > >> head/sys/dev/wtap/if_wtap.c > >> > >> Modified: head/sys/dev/wtap/if_wtap.c > >> ============================================================================== > >> --- head/sys/dev/wtap/if_wtap.c Sat Feb 2 16:07:56 2019 (r343681) > >> +++ head/sys/dev/wtap/if_wtap.c Sat Feb 2 16:15:46 2019 (r343682) > >> @@ -373,7 +373,7 @@ wtap_vap_delete(struct ieee80211vap *vap) > >> destroy_dev(avp->av_dev); > >> callout_stop(&avp->av_swba); > >> ieee80211_vap_detach(vap); > >> - free((struct wtap_vap*) vap, M_80211_VAP); > >> + free(avp, M_80211_VAP); > > > > First one crees vap, second one frees avp, is that a typo, or intended > > change? > > ieee80211_vap_detach() will not free the vap, it will free only some > (internal) vap structures. Your commit message only states "drop unneeded cast", it does not mention the function change of no longering freeing vap. Also this is in routine wtap_vap_delete, which I would expect to free all things in the vap, and then free the vap. Why is a delete function only freeing "some (internal) vap structures?" -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902021743.x12HhVRH028585>