summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2014-10-27 19:46:48 +0100
committerThomas Haller <thaller@redhat.com>2014-10-27 20:34:15 +0100
commit38bf08ec44f7180322c43a8bc16b756ff74ea2ea (patch)
tree7717b7b0ae2a41340dfaabfd19df1a1616581365
parentd3ebe386ccf3297bfeeece013231068834d2a307 (diff)
downloadNetworkManager-th/bgo739258_wifi_bssid_fixes.tar.gz
wifi: Empty AP BSSID is NULL, not an invalid addressth/bgo739258_wifi_bssid_fixes
Since 3a54d050 the AP address is not a gbyte[], but a char *. The fake AP BSSID fixup could trigger an assertion failure: Oct 26 11:14:45 goatlord.localdomain NetworkManager[540]: nm_ethernet_address_is_valid: assertion 'addr != NULL' failed https://bugzilla.gnome.org/show_bug.cgi?id=739258 Fixes: 3a54d050985d6ef2067b025571910a8ccd3cbd57
-rw-r--r--src/devices/wifi/nm-device-wifi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 14d68c73ca..c78eb61f84 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -3021,7 +3021,7 @@ activation_success_handler (NMDevice *device)
* the BSSID off the card and fill in the BSSID of the activation AP.
*/
nm_platform_wifi_get_bssid (ifindex, bssid);
- if (!nm_ethernet_address_is_valid (nm_ap_get_address (ap), -1)) {
+ if (!nm_ap_get_address (ap)) {
char *bssid_str = nm_utils_hwaddr_ntoa (bssid, ETH_ALEN);
nm_ap_set_address (ap, bssid_str);
g_free (bssid_str);