Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 10:32:33 +01:00
Code Releases Activity

scan: Call .destroy in scan_request_free

Browse Source 
The main difference with this is that scan_context removal will also
trigger the .destroy calls.  Normally there won't be any requests left
during scan_context but if there were any we should call destroy on
them.
This commit is contained in:
Andrew Zaborowski 2018-11-29 19:56:00 +01:00 committed by Denis Kenzior
parent c9d8346d40
commit 0d3f16ec5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/scan.c
View File

@ -119,6 +119,9 @@ static void scan_request_free(void *data)
{ {
struct scan_request *sr = data; struct scan_request *sr = data;
if (sr->destroy)
sr->destroy(sr->userdata);
l_queue_destroy(sr->cmds, (l_queue_destroy_func_t) l_genl_msg_unref); l_queue_destroy(sr->cmds, (l_queue_destroy_func_t) l_genl_msg_unref);
l_free(sr); l_free(sr);
@ -129,9 +132,6 @@ static void scan_request_trigger_failed(struct scan_request *sr, int err)
if (sr->trigger) if (sr->trigger)
sr->trigger(err, sr->userdata); sr->trigger(err, sr->userdata);
if (sr->destroy)
sr->destroy(sr->userdata);
scan_request_free(sr); scan_request_free(sr);
} }