From 6fc37cb779fc9ded6ac48f1e21db22534a8ab4da Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 25 Sep 2019 16:20:05 +0200 Subject: [PATCH] supplicant: rework condition in nm_supplicant_config_add_bgscan() Avoid the duplicate condition. Also, fix indentation/whitespace. No change in behavior. --- src/supplicant/nm-supplicant-config.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c index 258039953..5cfca0034 100644 --- a/src/supplicant/nm-supplicant-config.c +++ b/src/supplicant/nm-supplicant-config.c @@ -561,7 +561,6 @@ nm_supplicant_config_add_bgscan (NMSupplicantConfig *self, NMSettingWireless *s_wifi; NMSettingWirelessSecurity *s_wsec; const char *bgscan; - gsize num_seen_bssids; s_wifi = nm_connection_get_setting_wireless (connection); g_assert (s_wifi); @@ -594,14 +593,12 @@ nm_supplicant_config_add_bgscan (NMSupplicantConfig *self, * when the signal is still somewhat OK so we have an up-to-date roam * candidate list when the signal gets bad. */ - num_seen_bssids = nm_setting_wireless_get_num_seen_bssids (s_wifi); - s_wsec = nm_connection_get_setting_wireless_security (connection); - if (num_seen_bssids > 1 || s_wsec) { - if (num_seen_bssids > 1 || NM_IN_STRSET (nm_setting_wireless_security_get_key_mgmt (s_wsec), - "ieee8021x", - "wpa-eap")) - bgscan = "simple:30:-65:300"; - } + if ( nm_setting_wireless_get_num_seen_bssids (s_wifi) > 1 + || ( (s_wsec = nm_connection_get_setting_wireless_security (connection)) + && NM_IN_STRSET (nm_setting_wireless_security_get_key_mgmt (s_wsec), + "ieee8021x", + "wpa-eap")) + bgscan = "simple:30:-65:300"; return nm_supplicant_config_add_option (self, "bgscan", bgscan, -1, FALSE, error); }