fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 23:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

* src/nm-device-802-11-wireless.c: Whoops!

Browse source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1742 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-05-17 21:24:25 +00:00
parent 8b11dc086a
commit 27e78ebd39
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nm-device-802-11-wireless.c
View file

@ -155,18 +155,18 @@ nm_device_802_11_wireless_update_bssid (NMDevice80211Wireless *self)
g_return_if_fail (self != NULL);
/* Grab the scan lock since the current AP is meaningless during a scan. */
if (!nm_try_acquire_mutex (self->priv->scan_mutex, __FUNCTION__))
/* The current BSSID is pretty meaningless during a scan */
if (self->priv->scanning)
return;
/* If we aren't the active device with an active AP, there is no meaningful BSSID value */
req = nm_device_get_act_request (NM_DEVICE (self));
if (!req)
goto out;
return;
ap = nm_act_request_get_ap (req);
if (!ap)
goto out;
return;
/* Get the current BSSID. If it is valid but does not match the stored value, update it. */
nm_device_802_11_wireless_get_bssid (self, &new_bssid);
@ -191,9 +191,6 @@ nm_device_802_11_wireless_update_bssid (NMDevice80211Wireless *self)
g_assert (app_data);
nm_dbus_update_network_info (app_data->dbus_connection, ap, automatic);
}
out:
nm_unlock_mutex (self->priv->scan_mutex, __func__);
}