Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-10-04 02:18:49 +02:00
Code Releases Activity

station: Return errno from station_roam_scan_known_freqs

Browse Source
This commit is contained in:
Denis Kenzior 2020-06-30 12:02:09 -05:00
parent 05b803cb76
commit 10e83aa347
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/station.c
View File

@ -1794,23 +1794,21 @@ static void station_roam_scan(struct station *station,
station_roam_failed(station); station_roam_failed(station);
} }
static bool station_roam_scan_known_freqs(struct station *station) static int station_roam_scan_known_freqs(struct station *station)
{ {
const struct network_info *info = network_get_info( const struct network_info *info = network_get_info(
station->connected_network); station->connected_network);
struct scan_freq_set *freqs = network_info_get_roam_frequencies(info, struct scan_freq_set *freqs = network_info_get_roam_frequencies(info,
station->connected_bss->frequency, 5); station->connected_bss->frequency, 5);
if (!freqs) { if (!freqs)
l_debug("no known frequencies to scan"); return -ENODATA;
return false;
}
station_roam_scan(station, freqs); station_roam_scan(station, freqs);
scan_freq_set_free(freqs); scan_freq_set_free(freqs);
return true; return 0;
} }
static uint32_t station_freq_from_neighbor_report(const uint8_t *country, static uint32_t station_freq_from_neighbor_report(const uint8_t *country,
@ -1869,6 +1867,7 @@ static void station_neighbor_report_cb(struct netdev *netdev, int err,
struct scan_freq_set *freq_set_md, *freq_set_no_md; struct scan_freq_set *freq_set_md, *freq_set_no_md;
uint32_t current_freq = 0; uint32_t current_freq = 0;
struct handshake_state *hs = netdev_get_handshake(station->netdev); struct handshake_state *hs = netdev_get_handshake(station->netdev);
int r;
l_debug("ifindex: %u, error: %d(%s)", l_debug("ifindex: %u, error: %d(%s)",
netdev_get_ifindex(station->netdev), netdev_get_ifindex(station->netdev),
@ -1882,10 +1881,13 @@ static void station_neighbor_report_cb(struct netdev *netdev, int err,
return; return;
if (!reports || err) { if (!reports || err) {
if (!station_roam_scan_known_freqs(station)) { r = station_roam_scan_known_freqs(station);
if (r == -ENODATA)
l_debug("no neighbor report results or known freqs"); l_debug("no neighbor report results or known freqs");
if (r < 0)
station_roam_failed(station); station_roam_failed(station);
}
return; return;
} }
@ -1992,6 +1994,7 @@ static void station_neighbor_report_cb(struct netdev *netdev, int err,
static void station_roam_trigger_cb(struct l_timeout *timeout, void *user_data) static void station_roam_trigger_cb(struct l_timeout *timeout, void *user_data)
{ {
struct station *station = user_data; struct station *station = user_data;
int r;
l_debug("%u", netdev_get_ifindex(station->netdev)); l_debug("%u", netdev_get_ifindex(station->netdev));
@ -2014,11 +2017,12 @@ static void station_roam_trigger_cb(struct l_timeout *timeout, void *user_data)
station_neighbor_report_cb)) station_neighbor_report_cb))
return; return;
if (!station_roam_scan_known_freqs(station)) { r = station_roam_scan_known_freqs(station);
if (r == -ENODATA)
l_debug("No neighbor report or known frequencies, roam failed"); l_debug("No neighbor report or known frequencies, roam failed");
if (r < 0)
station_roam_failed(station); station_roam_failed(station);
return;
}
} }
static void station_roam_timeout_rearm(struct station *station, int seconds) static void station_roam_timeout_rearm(struct station *station, int seconds)