diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-11-11 18:00:33 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-11-11 18:10:52 +0100 |
| commit | 0ff3699af5aaf9e403964bf6b52db30f78e2f069 (patch) | |
| tree | 66302853e52b1c99aaa86e01a453156fefa6e955 | |
| parent | ebe3320e62e6f4068467f2410b93be2a05ff6d53 (diff) | |
| download | NetworkManager-0ff3699af5aaf9e403964bf6b52db30f78e2f069.tar.gz | |
Revert "wifi: do no crash when getting BSSID fails"
Since commit ebe3320e62e6f4068467f2410b93be2a05ff6d53,
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 e0e043ef3918de54f8d19a3af07d3367962970e5.
(cherry picked from commit d5373959f9245faeebb1ba32b5b2b688d073ee6c)
| -rw-r--r-- | src/devices/wifi/nm-device-wifi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 6f63756cbf..3c4ca9b141 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -1649,11 +1649,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 */ |