colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

supplicant: rework condition in nm_supplicant_config_add_bgscan()

Browse Source 
Avoid the duplicate condition.

Also, fix indentation/whitespace.

No change in behavior.
This commit is contained in:
Thomas Haller
2019-09-25 16:20:05 +02:00
parent 140619854e
commit 6fc37cb779
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/supplicant/nm-supplicant-config.c
View File

@@ -561,7 +561,6 @@ nm_supplicant_config_add_bgscan (NMSupplicantConfig *self,
NMSettingWireless *s_wifi; NMSettingWireless *s_wifi;
NMSettingWirelessSecurity *s_wsec; NMSettingWirelessSecurity *s_wsec;
const char *bgscan; const char *bgscan;
gsize num_seen_bssids;
s_wifi = nm_connection_get_setting_wireless (connection); s_wifi = nm_connection_get_setting_wireless (connection);
g_assert (s_wifi); 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 * when the signal is still somewhat OK so we have an up-to-date roam
* candidate list when the signal gets bad. * candidate list when the signal gets bad.
*/ */
num_seen_bssids = nm_setting_wireless_get_num_seen_bssids (s_wifi); if ( nm_setting_wireless_get_num_seen_bssids (s_wifi) > 1
s_wsec = nm_connection_get_setting_wireless_security (connection); || ( (s_wsec = nm_connection_get_setting_wireless_security (connection))
if (num_seen_bssids > 1 || s_wsec) { && NM_IN_STRSET (nm_setting_wireless_security_get_key_mgmt (s_wsec),
if (num_seen_bssids > 1 || NM_IN_STRSET (nm_setting_wireless_security_get_key_mgmt (s_wsec), "ieee8021x",
"ieee8021x", "wpa-eap"))
"wpa-eap")) bgscan = "simple:30:-65:300";
bgscan = "simple:30:-65:300";
}
return nm_supplicant_config_add_option (self, "bgscan", bgscan, -1, FALSE, error); return nm_supplicant_config_add_option (self, "bgscan", bgscan, -1, FALSE, error);
} }