Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

scan: Fix sc->get_scan_cmd_id logic 

Save the actual cmd_id returned from l_genl_family_dump and zero it in
the get_scan_done.  There's no need to zero it in scan_cancel because
get_scan_done gets called automatically.
This commit is contained in:
Andrew Zaborowski 2019-07-08 16:02:57 +02:00 committed by Denis Kenzior
parent 5223dee050
commit ec60b51d01
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/scan.c
View File

@ -538,7 +538,6 @@ bool scan_cancel(uint32_t ifindex, uint32_t id)
l_genl_family_cancel(nl80211, sc->get_scan_cmd_id);
sc->start_cmd_id = 0;
sc->get_scan_cmd_id = 0;
l_queue_remove(sc->requests, sr);
sc->started = false;
start_next_scan_request(sc);
@ -1258,6 +1257,8 @@ static void get_scan_done(void *user)
l_debug("get_scan_done");
sc->get_scan_cmd_id = 0;
if (l_queue_peek_head(sc->requests) == results->sr)
scan_finished(sc, 0, results->bss_list, results->sr);
else
@ -1438,8 +1439,9 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
scan_msg = l_genl_msg_new_sized(NL80211_CMD_GET_SCAN, 8);
l_genl_msg_append_attr(scan_msg, NL80211_ATTR_IFINDEX, 4,
&attr_ifindex);
l_genl_family_dump(nl80211, scan_msg, get_scan_callback,
results, get_scan_done);
sc->get_scan_cmd_id = l_genl_family_dump(nl80211, scan_msg,
get_scan_callback,
results, get_scan_done);
break;
}