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

station: reload settings in 'netconfig_after_roam' case

Browse Source 
If netconfig is canceled before completion (when roaming) the
settings are freed and never loaded again once netconfig is started
post-roam. Now after a roam make sure to re-load the settings and
start netconfig.
This commit is contained in:
James Prestwood 2023-10-20 06:55:55 -07:00 committed by Denis Kenzior
parent ccb29663cc
commit ef27f87dbe
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/station.c
View File

@ -2055,6 +2055,20 @@ static void station_netconfig_event_handler(enum netconfig_event event,
} }
} }
static bool netconfig_after_roam(struct station *station)
{
const struct network *network = station_get_connected_network(station);
/* Netconfig was reset which frees all settings, reload now */
if (!netconfig_load_settings(station->netconfig,
network_get_settings(network)))
return false;
return netconfig_configure(station->netconfig,
station_netconfig_event_handler,
station);
}
static void station_roamed(struct station *station) static void station_roamed(struct station *station)
{ {
station->roam_scan_full = false; station->roam_scan_full = false;
@ -2086,9 +2100,7 @@ static void station_roamed(struct station *station)
/* Re-enable netconfig if it never finished on the last BSS */ /* Re-enable netconfig if it never finished on the last BSS */
if (station->netconfig_after_roam) { if (station->netconfig_after_roam) {
station->netconfig_after_roam = false; station->netconfig_after_roam = false;
L_WARN_ON(!netconfig_configure(station->netconfig, L_WARN_ON(!netconfig_after_roam(station));
station_netconfig_event_handler,
station));
} else } else
station_enter_state(station, STATION_STATE_CONNECTED); station_enter_state(station, STATION_STATE_CONNECTED);
} }
@ -2126,9 +2138,7 @@ static void station_roam_failed(struct station *station)
/* Re-enable netconfig if needed, even on a failed roam */ /* Re-enable netconfig if needed, even on a failed roam */
if (station->netconfig_after_roam) { if (station->netconfig_after_roam) {
station->netconfig_after_roam = false; station->netconfig_after_roam = false;
L_WARN_ON(!netconfig_configure(station->netconfig, L_WARN_ON(!netconfig_after_roam(station));
station_netconfig_event_handler,
station));
} }
/* /*