From d5373959f9245faeebb1ba32b5b2b688d073ee6c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 11 Nov 2015 18:00:33 +0100 Subject: Revert "wifi: do no crash when getting BSSID fails" Since commit 7cb323d92303df8c87d0c40c1c67b4d3a065275c, nm_ap_new_from_properties() will always return an AP with BSSID set. Restore the assertion during try_fill_ssid_for_hidden_ap(). This reverts commit e9bc18d2a7befb032052555ffba22bc72c9b8c2f. --- src/devices/wifi/nm-device-wifi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 9a0fe99d08..f2470fa198 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -1498,11 +1498,7 @@ try_fill_ssid_for_hidden_ap (NMAccessPoint *ap) g_return_if_fail (nm_ap_get_ssid (ap) == NULL); bssid = nm_ap_get_address (ap); - if (!bssid) { - nm_log_dbg (LOGD_WIFI, "failed to get BSSID for hidden AP %s", - str_if_set (nm_ap_get_supplicant_path (ap), "(none)")); - return; - } + g_return_if_fail (bssid); /* Look for this AP's BSSID in the seen-bssids list of a connection, * and if a match is found, copy over the SSID */ -- cgit v1.2.1