fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 17:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

supplicant: remove unused return value from nm_supplicant_interface_request_scan()

Browse source 
It cannot fail, remove code that anticipates a failure of request-scan.

(cherry picked from commit dce13b6f11)
This commit is contained in:
Thomas Haller 2017-02-15 00:22:46 +01:00
parent 6ce8cf361a
commit a6d3d17f5e
3 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/devices/wifi/nm-device-wifi.c
View file

@ -1422,9 +1422,7 @@ static void
request_wireless_scan (NMDeviceWifi *self, gboolean force_if_scanning, GVariant *scan_options)
{
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
gboolean backoff = FALSE;
GPtrArray *ssids = NULL;
gboolean new_scan_requested = FALSE;
gboolean request_started = FALSE;
nm_clear_g_source (&priv->pending_scan_id);
@ -1434,6 +1432,8 @@ request_wireless_scan (NMDeviceWifi *self, gboolean force_if_scanning, GVariant
}
if (check_scanning_allowed (self)) {
gs_unref_ptrarray GPtrArray *ssids = NULL;
_LOGD (LOGD_WIFI, "wifi-scan: scanning requested");
if (scan_options) {
@ -1471,22 +1471,14 @@ request_wireless_scan (NMDeviceWifi *self, gboolean force_if_scanning, GVariant
_hw_addr_set_scanning (self, FALSE);
if (nm_supplicant_interface_request_scan (priv->sup_iface, ssids)) {
/* success */
backoff = TRUE;
_requested_scan_set (self, TRUE);
new_scan_requested = TRUE;
}
if (ssids)
g_ptr_array_unref (ssids);
nm_supplicant_interface_request_scan (priv->sup_iface, ssids);
request_started = TRUE;
} else
_LOGD (LOGD_WIFI, "wifi-scan: scanning requested but not allowed at this time");
if (!new_scan_requested)
_requested_scan_set (self, FALSE);
_requested_scan_set (self, request_started);
schedule_scan (self, backoff);
schedule_scan (self, request_started);
}
static gboolean

5
src/supplicant/nm-supplicant-interface.c
View file

@ -1340,14 +1340,14 @@ scan_request_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
}
}
gboolean
void
nm_supplicant_interface_request_scan (NMSupplicantInterface *self, const GPtrArray *ssids)
{
NMSupplicantInterfacePrivate *priv;
GVariantBuilder builder;
guint i;
g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), FALSE);
g_return_if_fail (NM_IS_SUPPLICANT_INTERFACE (self));
priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
@ -1375,7 +1375,6 @@ nm_supplicant_interface_request_scan (NMSupplicantInterface *self, const GPtrArr
priv->other_cancellable,
(GAsyncReadyCallback) scan_request_cb,
self);
return TRUE;
}
/*****************************************************************************/

2
src/supplicant/nm-supplicant-interface.h
View file

@ -96,7 +96,7 @@ void nm_supplicant_interface_disconnect (NMSupplicantInterface * iface);
const char *nm_supplicant_interface_get_object_path (NMSupplicantInterface * iface);
gboolean nm_supplicant_interface_request_scan (NMSupplicantInterface * self, const GPtrArray *ssids);
void nm_supplicant_interface_request_scan (NMSupplicantInterface * self, const GPtrArray *ssids);
NMSupplicantInterfaceState nm_supplicant_interface_get_state (NMSupplicantInterface * self);