3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-27 03:19:24 +01:00

scan: Let ELL to handle the message sizing

This commit is contained in:
Tim Kourt 2019-02-27 16:44:16 -08:00 committed by Denis Kenzior
parent 9e11175cf8
commit 9f52036b85

View File

@ -301,13 +301,6 @@ static void scan_build_attr_scan_frequencies(struct l_genl_msg *msg,
l_genl_msg_leave_nested(msg); l_genl_msg_leave_nested(msg);
} }
static void scan_freq_count(uint32_t freq, void *user_data)
{
int *count = user_data;
*count += 1;
}
static bool scan_mac_address_randomization_is_disabled(void) static bool scan_mac_address_randomization_is_disabled(void)
{ {
const struct l_settings *config = iwd_get_config(); const struct l_settings *config = iwd_get_config();
@ -326,16 +319,9 @@ static struct l_genl_msg *scan_build_cmd(struct scan_context *sc,
const struct scan_parameters *params) const struct scan_parameters *params)
{ {
struct l_genl_msg *msg; struct l_genl_msg *msg;
int n_channels = 0;
uint32_t flags = 0; uint32_t flags = 0;
if (params->freqs) msg = l_genl_msg_new(NL80211_CMD_TRIGGER_SCAN);
scan_freq_set_foreach(params->freqs, scan_freq_count,
&n_channels);
msg = l_genl_msg_new_sized(NL80211_CMD_TRIGGER_SCAN,
64 + params->extra_ie_size +
4 * n_channels);
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &sc->ifindex); l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &sc->ifindex);