cfg80211: free_priv for BSS info
When cfg80211 users have their own allocated data in the per-BSS private data, they will need to free this when the BSS struct is destroyed. Add a free_priv method and fix one place where the BSS was kfree'd rather than released properly. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
99cf5f5f35
commit
78c1c7e109
|
@ -567,6 +567,7 @@ enum cfg80211_signal_type {
|
|||
* @len_information_elements: total length of the information elements
|
||||
* @signal: signal strength value
|
||||
* @signal_type: signal type
|
||||
* @free_priv: function pointer to free private data
|
||||
* @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
|
||||
*/
|
||||
struct cfg80211_bss {
|
||||
|
@ -582,6 +583,7 @@ struct cfg80211_bss {
|
|||
s32 signal;
|
||||
enum cfg80211_signal_type signal_type;
|
||||
|
||||
void (*free_priv)(struct cfg80211_bss *bss);
|
||||
u8 priv[0] __attribute__((__aligned__(sizeof(void *))));
|
||||
};
|
||||
|
||||
|
|
|
@ -376,7 +376,7 @@ void cfg80211_dev_free(struct cfg80211_registered_device *drv)
|
|||
mutex_destroy(&drv->mtx);
|
||||
mutex_destroy(&drv->devlist_mtx);
|
||||
list_for_each_entry_safe(scan, tmp, &drv->bss_list, list)
|
||||
kfree(scan);
|
||||
cfg80211_put_bss(&scan->pub);
|
||||
kfree(drv);
|
||||
}
|
||||
|
||||
|
|
|
@ -56,6 +56,8 @@ static void bss_release(struct kref *ref)
|
|||
struct cfg80211_internal_bss *bss;
|
||||
|
||||
bss = container_of(ref, struct cfg80211_internal_bss, ref);
|
||||
if (bss->pub.free_priv)
|
||||
bss->pub.free_priv(&bss->pub);
|
||||
kfree(bss);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue