* [PATCH] station: Simplify and comply with coding style
@ 2019-10-08 20:18 Tim Kourt
2019-10-09 19:19 ` Denis Kenzior
0 siblings, 1 reply; 2+ messages in thread
From: Tim Kourt @ 2019-10-08 20:18 UTC (permalink / raw)
To: iwd
[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]
---
src/station.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/station.c b/src/station.c
index 9b3e087e..72393d51 100644
--- a/src/station.c
+++ b/src/station.c
@@ -1164,19 +1164,20 @@ static void station_enter_state(struct station *station,
case STATION_STATE_CONNECTED:
periodic_scan_stop(station);
+ if (!station->netconfig)
+ break;
+
if (station->state == STATION_STATE_ROAMING) {
- if (station->netconfig)
- netconfig_reconfigure(station->netconfig);
+ netconfig_reconfigure(station->netconfig);
break;
}
- if (station->netconfig)
- netconfig_configure(station->netconfig,
- network_get_settings(
- station->connected_network),
- netdev_get_address(
- station->netdev));
+ netconfig_configure(station->netconfig,
+ network_get_settings(
+ station->connected_network),
+ netdev_get_address(
+ station->netdev));
break;
case STATION_STATE_DISCONNECTING:
case STATION_STATE_ROAMING:
@@ -3066,9 +3067,10 @@ static void station_free(struct station *station)
if (station->connected_bss)
netdev_disconnect(station->netdev, NULL, NULL);
- if (station->netconfig)
+ if (station->netconfig) {
netconfig_destroy(station->netconfig);
- station->netconfig = NULL;
+ station->netconfig = NULL;
+ }
periodic_scan_stop(station);
--
2.13.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] station: Simplify and comply with coding style
2019-10-08 20:18 [PATCH] station: Simplify and comply with coding style Tim Kourt
@ 2019-10-09 19:19 ` Denis Kenzior
0 siblings, 0 replies; 2+ messages in thread
From: Denis Kenzior @ 2019-10-09 19:19 UTC (permalink / raw)
To: iwd
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
Hi Tim,
On 10/8/19 3:18 PM, Tim Kourt wrote:
> ---
> src/station.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
Applied, thanks.
Regards,
-Denis
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-09 19:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-08 20:18 [PATCH] station: Simplify and comply with coding style Tim Kourt
2019-10-09 19:19 ` Denis Kenzior
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox