Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

station: Move netconfig_reset() to common path

Browse Source 
To avoid repetition, call netconfig_reset in
station_reset_connection_state.
This commit is contained in:
Andrew Zaborowski 2022-06-16 02:02:19 +02:00 committed by Denis Kenzior
parent e88a0757ab
commit 032a3d1473
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/station.c
View File

@ -1623,6 +1623,9 @@ static void station_reset_connection_state(struct station *station)
station_roam_state_clear(station); station_roam_state_clear(station);
if (station->netconfig)
netconfig_reset(station->netconfig);
/* Refresh the ordered network list */ /* Refresh the ordered network list */
network_rank_update(station->connected_network, false); network_rank_update(station->connected_network, false);
l_queue_remove(station->networks_sorted, station->connected_network); l_queue_remove(station->networks_sorted, station->connected_network);
@ -1655,9 +1658,6 @@ static void station_disassociated(struct station *station)
{ {
l_debug("%u", netdev_get_ifindex(station->netdev)); l_debug("%u", netdev_get_ifindex(station->netdev));
if (station->netconfig)
netconfig_reset(station->netconfig);
station_reset_connection_state(station); station_reset_connection_state(station);
station_enter_state(station, STATION_STATE_DISCONNECTED); station_enter_state(station, STATION_STATE_DISCONNECTED);
@ -3096,9 +3096,6 @@ static void station_disconnect_onconnect(struct station *station,
return; return;
} }
if (station->netconfig)
netconfig_reset(station->netconfig);
station_reset_connection_state(station); station_reset_connection_state(station);
station_enter_state(station, STATION_STATE_DISCONNECTING); station_enter_state(station, STATION_STATE_DISCONNECTING);
@ -3402,9 +3399,6 @@ int station_disconnect(struct station *station)
if (!station->connected_bss) if (!station->connected_bss)
return -ENOTCONN; return -ENOTCONN;
if (station->netconfig)
netconfig_reset(station->netconfig);
/* /*
* If the disconnect somehow fails we won't know if we're still * If the disconnect somehow fails we won't know if we're still
* connected so we may as well indicate now that we're no longer * connected so we may as well indicate now that we're no longer