Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

station: Simplify and comply with coding style

This commit is contained in:
Tim Kourt 2019-10-08 13:18:17 -07:00 committed by Denis Kenzior
parent 94e2769e93
commit 48be2c0252
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/station.c
View File

@ -1164,19 +1164,20 @@ static void station_enter_state(struct station *station,
case STATION_STATE_CONNECTED: case STATION_STATE_CONNECTED:
periodic_scan_stop(station); periodic_scan_stop(station);
if (!station->netconfig)
break;
if (station->state == STATION_STATE_ROAMING) { if (station->state == STATION_STATE_ROAMING) {
if (station->netconfig) netconfig_reconfigure(station->netconfig);
netconfig_reconfigure(station->netconfig);
break; break;
} }
if (station->netconfig) netconfig_configure(station->netconfig,
netconfig_configure(station->netconfig, network_get_settings(
network_get_settings( station->connected_network),
station->connected_network), netdev_get_address(
netdev_get_address( station->netdev));
station->netdev));
break; break;
case STATION_STATE_DISCONNECTING: case STATION_STATE_DISCONNECTING:
case STATION_STATE_ROAMING: case STATION_STATE_ROAMING:
@ -3066,9 +3067,10 @@ static void station_free(struct station *station)
if (station->connected_bss) if (station->connected_bss)
netdev_disconnect(station->netdev, NULL, NULL); netdev_disconnect(station->netdev, NULL, NULL);
if (station->netconfig) if (station->netconfig) {
netconfig_destroy(station->netconfig); netconfig_destroy(station->netconfig);
station->netconfig = NULL; station->netconfig = NULL;
}
periodic_scan_stop(station); periodic_scan_stop(station);