Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-04-15 06:28:00 +02:00
Code Releases Activity

station: reflow station_roam_failed

Browse Source 
If the roam failed and we are no longer connected, station_disassociated
is called which ends up calling station_roam_state_clear.  Thus
resetting the variables is not needed.  Reflow the logic to make this a
bit more explicit.
This commit is contained in:
Denis Kenzior 2020-06-30 10:35:47 -05:00
parent faa31802c5
commit 05b803cb76
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/station.c
View File

@ -1364,22 +1364,26 @@ static void station_roamed(struct station *station)
static void station_roam_failed(struct station *station) static void station_roam_failed(struct station *station)
{ {
l_debug("%u", netdev_get_ifindex(station->netdev));
/*
* If we attempted a reassociation or a fast transition, and ended up
* here then we are now disconnected.
*/
if (station->state == STATION_STATE_ROAMING) {
station_disassociated(station);
return;
}
/* /*
* If we're still connected to the old BSS, only clear preparing_roam * If we're still connected to the old BSS, only clear preparing_roam
* and reattempt in 60 seconds if signal level is still low at that * and reattempt in 60 seconds if signal level is still low at that
* time. Otherwise (we'd already started negotiating with the * time.
* transition target, preparing_roam is false, state is roaming) we
* are now disconnected.
*/ */
l_debug("%u", netdev_get_ifindex(station->netdev));
station->preparing_roam = false; station->preparing_roam = false;
station->ap_directed_roaming = false; station->ap_directed_roaming = false;
if (station->state == STATION_STATE_ROAMING) if (station->signal_low)
station_disassociated(station);
else if (station->signal_low)
station_roam_timeout_rearm(station, 60); station_roam_timeout_rearm(station, 60);
} }