scan: parse the scan start time
The kernel sends NL80211_ATTR_SCAN_START_TIME_TSF with CMD_TRIGGER and RRM requires this value for beacon measurement reports. The start time is parsed during CMD_TRIGGER and set into the scan request. A getter was added to obtain this time value for an already triggered scan. After making the change, the SCAN_ABORTED case was cleaned up a bit to remove the local scan_request usage in favor of the one used for all the other cases.
This commit is contained in:
parent
002fdb5c10
commit
27af5b715e
41
src/scan.c
41
src/scan.c
|
@ -75,6 +75,8 @@ struct scan_request {
|
||||||
scan_destroy_func_t destroy;
|
scan_destroy_func_t destroy;
|
||||||
bool passive:1; /* Active or Passive scan? */
|
bool passive:1; /* Active or Passive scan? */
|
||||||
struct l_queue *cmds;
|
struct l_queue *cmds;
|
||||||
|
/* The time the current scan was started. Reported in TRIGGER_SCAN */
|
||||||
|
uint64_t start_time_tsf;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct scan_context {
|
struct scan_context {
|
||||||
|
@ -778,6 +780,25 @@ bool scan_periodic_stop(uint64_t wdev_id)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint64_t scan_get_triggered_time(uint64_t wdev_id, uint32_t id)
|
||||||
|
{
|
||||||
|
struct scan_context *sc;
|
||||||
|
struct scan_request *sr;
|
||||||
|
|
||||||
|
sc = l_queue_find(scan_contexts, scan_context_match, &wdev_id);
|
||||||
|
if (!sc)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (!sc->triggered)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
sr = l_queue_find(sc->requests, scan_request_match, L_UINT_TO_PTR(id));
|
||||||
|
if (!sr)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return sr->start_time_tsf;
|
||||||
|
}
|
||||||
|
|
||||||
static void scan_periodic_timeout(struct l_timeout *timeout, void *user_data)
|
static void scan_periodic_timeout(struct l_timeout *timeout, void *user_data)
|
||||||
{
|
{
|
||||||
struct scan_context *sc = user_data;
|
struct scan_context *sc = user_data;
|
||||||
|
@ -1439,6 +1460,8 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
|
||||||
uint32_t wiphy_id;
|
uint32_t wiphy_id;
|
||||||
struct scan_context *sc;
|
struct scan_context *sc;
|
||||||
bool active_scan = false;
|
bool active_scan = false;
|
||||||
|
uint64_t start_time_tsf = 0;
|
||||||
|
struct scan_request *sr;
|
||||||
|
|
||||||
cmd = l_genl_msg_get_command(msg);
|
cmd = l_genl_msg_get_command(msg);
|
||||||
|
|
||||||
|
@ -1461,15 +1484,22 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
|
||||||
case NL80211_ATTR_SCAN_SSIDS:
|
case NL80211_ATTR_SCAN_SSIDS:
|
||||||
active_scan = true;
|
active_scan = true;
|
||||||
break;
|
break;
|
||||||
|
case NL80211_ATTR_SCAN_START_TIME_TSF:
|
||||||
|
if (len != sizeof(uint64_t))
|
||||||
|
return;
|
||||||
|
|
||||||
|
start_time_tsf = l_get_u64(data);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sr = l_queue_peek_head(sc->requests);
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case NL80211_CMD_NEW_SCAN_RESULTS:
|
case NL80211_CMD_NEW_SCAN_RESULTS:
|
||||||
{
|
{
|
||||||
struct l_genl_msg *scan_msg;
|
struct l_genl_msg *scan_msg;
|
||||||
struct scan_results *results;
|
struct scan_results *results;
|
||||||
struct scan_request *sr = l_queue_peek_head(sc->requests);
|
|
||||||
bool send_next = false;
|
bool send_next = false;
|
||||||
bool get_results = false;
|
bool get_results = false;
|
||||||
|
|
||||||
|
@ -1543,12 +1573,11 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
|
||||||
else
|
else
|
||||||
sc->state = SCAN_STATE_PASSIVE;
|
sc->state = SCAN_STATE_PASSIVE;
|
||||||
|
|
||||||
|
sr->start_time_tsf = start_time_tsf;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NL80211_CMD_SCAN_ABORTED:
|
case NL80211_CMD_SCAN_ABORTED:
|
||||||
{
|
|
||||||
struct scan_request *sr = l_queue_peek_head(sc->requests);
|
|
||||||
|
|
||||||
if (sc->state == SCAN_STATE_NOT_RUNNING)
|
if (sc->state == SCAN_STATE_NOT_RUNNING)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1557,8 +1586,7 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
|
||||||
if (sc->triggered) {
|
if (sc->triggered) {
|
||||||
sc->triggered = false;
|
sc->triggered = false;
|
||||||
|
|
||||||
scan_finished(sc, -ECANCELED, NULL,
|
scan_finished(sc, -ECANCELED, NULL, sr);
|
||||||
l_queue_peek_head(sc->requests));
|
|
||||||
} else if (sr && !sc->start_cmd_id && !sc->get_scan_cmd_id) {
|
} else if (sr && !sc->start_cmd_id && !sc->get_scan_cmd_id) {
|
||||||
/*
|
/*
|
||||||
* If this was an external scan that got aborted
|
* If this was an external scan that got aborted
|
||||||
|
@ -1573,7 +1601,6 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t scan_freq_to_channel(uint32_t freq, enum scan_band *out_band)
|
uint8_t scan_freq_to_channel(uint32_t freq, enum scan_band *out_band)
|
||||||
{
|
{
|
||||||
|
|
|
@ -124,6 +124,8 @@ void scan_periodic_start(uint64_t wdev_id, scan_trigger_func_t trigger,
|
||||||
scan_notify_func_t func, void *userdata);
|
scan_notify_func_t func, void *userdata);
|
||||||
bool scan_periodic_stop(uint64_t wdev_id);
|
bool scan_periodic_stop(uint64_t wdev_id);
|
||||||
|
|
||||||
|
uint64_t scan_get_triggered_time(uint64_t wdev_id, uint32_t id);
|
||||||
|
|
||||||
void scan_bss_free(struct scan_bss *bss);
|
void scan_bss_free(struct scan_bss *bss);
|
||||||
int scan_bss_rank_compare(const void *a, const void *b, void *user);
|
int scan_bss_rank_compare(const void *a, const void *b, void *user);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue