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

Revert "scan: Drop unused frequency list parsing"

Browse Source 
This reverts commit 520ad56f83e67554ceb01340025db42bfb517e33.
This commit is contained in:
Denis Kenzior 2021-02-03 09:30:38 -06:00
parent 6a7c7df7fd
commit 79928e69cb
1 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/scan.c
View File

@ -115,6 +115,7 @@ struct scan_context {
struct scan_results { struct scan_results {
struct scan_context *sc; struct scan_context *sc;
struct l_queue *bss_list; struct l_queue *bss_list;
struct scan_freq_set *freqs;
uint64_t time_stamp; uint64_t time_stamp;
struct scan_request *sr; struct scan_request *sr;
}; };
@ -1200,6 +1201,28 @@ fail:
return NULL; return NULL;
} }
static struct scan_freq_set *scan_parse_attr_scan_frequencies(
struct l_genl_attr *attr)
{
uint16_t type, len;
const void *data;
struct scan_freq_set *set;
set = scan_freq_set_new();
while (l_genl_attr_next(attr, &type, &len, &data)) {
uint32_t freq;
if (len != sizeof(uint32_t))
continue;
freq = *((uint32_t *) data);
scan_freq_set_add(set, freq);
}
return set;
}
static struct scan_bss *scan_parse_result(struct l_genl_msg *msg, static struct scan_bss *scan_parse_result(struct l_genl_msg *msg,
uint64_t *out_wdev) uint64_t *out_wdev)
{ {
@ -1519,6 +1542,9 @@ static void get_scan_done(void *user)
l_queue_destroy(results->bss_list, l_queue_destroy(results->bss_list,
(l_queue_destroy_func_t) scan_bss_free); (l_queue_destroy_func_t) scan_bss_free);
if (results->freqs)
scan_freq_set_free(results->freqs);
l_free(results); l_free(results);
} }
@ -1538,6 +1564,31 @@ static bool scan_parse_flush_flag_from_msg(struct l_genl_msg *msg)
return false; return false;
} }
static void scan_parse_new_scan_results(struct l_genl_msg *msg,
struct scan_results *results)
{
struct l_genl_attr attr, nested;
uint16_t type, len;
const void *data;
if (!l_genl_attr_init(&attr, msg))
return;
while (l_genl_attr_next(&attr, &type, &len, &data)) {
switch (type) {
case NL80211_ATTR_SCAN_FREQUENCIES:
if (!l_genl_attr_recurse(&attr, &nested)) {
l_warn("Failed to parse ATTR_SCAN_FREQUENCIES");
break;
}
results->freqs =
scan_parse_attr_scan_frequencies(&nested);
break;
}
}
}
static void scan_notify(struct l_genl_msg *msg, void *user_data) static void scan_notify(struct l_genl_msg *msg, void *user_data)
{ {
struct l_genl_attr attr; struct l_genl_attr attr;
@ -1656,6 +1707,8 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
results->sr = sr; results->sr = sr;
results->bss_list = l_queue_new(); results->bss_list = l_queue_new();
scan_parse_new_scan_results(msg, results);
scan_msg = l_genl_msg_new_sized(NL80211_CMD_GET_SCAN, 8); scan_msg = l_genl_msg_new_sized(NL80211_CMD_GET_SCAN, 8);
l_genl_msg_append_attr(scan_msg, NL80211_ATTR_WDEV, 8, l_genl_msg_append_attr(scan_msg, NL80211_ATTR_WDEV, 8,
&sc->wdev_id); &sc->wdev_id);