Sat, 02 Feb 2019 19:43:31 +0200 було написано Rodney W. Grimes
<free...@pdx.rh.cn85.dnsmgr.net>:
Sat, 02 Feb 2019 19:25:56 +0200 ???? ???????? Rodney W. Grimes
<free...@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.
Ah, I see where things are getting confused; actually, avp == vap:
if_wtapvar.h:
#define WTAP_VAP(vap) ((struct wtap_vap *)(vap))
and the start of the function:
struct wtap_vap *avp = WTAP_VAP(vap);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
