Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 02:19:26 +01:00
Code Releases Activity

scan: Deprecate scan_send_start()

Browse Source 
On successful send, scan_send_start(..) used to set msg to NULL,
therefore the further management of the command by the caller was
impossible. This patch removes wrapper around l_genl_family_send()
and lets the callers to take responsibility for the command.
This commit is contained in:
Tim Kourt 2019-02-28 13:50:15 -08:00 committed by Denis Kenzior
parent 8fed50a448
commit c5d6b70520
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/scan.c
View File

@ -219,20 +219,6 @@ bool scan_ifindex_remove(uint32_t ifindex)
return true; return true;
} }
static unsigned int scan_send_start(struct l_genl_msg **msg,
scan_func_t callback, void *user_data)
{
unsigned int id = l_genl_family_send(nl80211, *msg, callback,
user_data, NULL);
if (id)
*msg = NULL;
else
l_error("Sending NL80211_CMD_TRIGGER_SCAN failed");
return id;
}
static void scan_request_triggered(struct l_genl_msg *msg, void *userdata) static void scan_request_triggered(struct l_genl_msg *msg, void *userdata)
{ {
struct scan_context *sc = userdata; struct scan_context *sc = userdata;
@ -438,7 +424,9 @@ static int scan_request_send_next(struct scan_context *sc,
if (!cmd) if (!cmd)
return -ENOMSG; return -ENOMSG;
sc->start_cmd_id = scan_send_start(&cmd, scan_request_triggered, sc); sc->start_cmd_id = l_genl_family_send(nl80211, cmd,
scan_request_triggered, sc,
NULL);
if (sc->start_cmd_id) { if (sc->start_cmd_id) {
l_genl_msg_ref(cmd); l_genl_msg_ref(cmd);
@ -448,6 +436,8 @@ static int scan_request_send_next(struct scan_context *sc,
return 0; return 0;
} }
l_error("Scan request: failed to trigger scan.");
return -EIO; return -EIO;
} }
@ -640,7 +630,9 @@ static bool scan_periodic_send_start(struct scan_context *sc)
if (!cmd) if (!cmd)
return false; return false;
sc->start_cmd_id = scan_send_start(&cmd, scan_periodic_triggered, sc); sc->start_cmd_id = l_genl_family_send(nl80211, cmd,
scan_periodic_triggered, sc,
NULL);
if (!sc->start_cmd_id) { if (!sc->start_cmd_id) {
l_genl_msg_unref(cmd); l_genl_msg_unref(cmd);
return false; return false;
@ -1294,8 +1286,9 @@ static bool scan_send_next_cmd(struct scan_context *sc)
sc->triggered = false; sc->triggered = false;
sc->start_cmd_id = scan_send_start(&cmd, sc->start_cmd_id = l_genl_family_send(nl80211, cmd,
scan_periodic_triggered, sc); scan_periodic_triggered,
sc, NULL);
if (!sc->start_cmd_id) { if (!sc->start_cmd_id) {
l_genl_msg_unref(cmd); l_genl_msg_unref(cmd);