diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
| commit | f1c906035c6ea7eb635664835c153aed553dc2e5 (patch) | |
| tree | 7b870b6cef1f902486dc706084124c6964b342a6 /src/devices/wifi | |
| parent | d6158994abe7b2be73443f933ed7fdcc40954c24 (diff) | |
| parent | d0408a3e3b1cc6effec321d098008ef0c4acf91b (diff) | |
Merge tag 'debian/1.10.4-1' into bionic
network-manager Debian release 1.10.4-1
Diffstat (limited to 'src/devices/wifi')
| -rw-r--r-- | src/devices/wifi/nm-device-wifi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 5e92f47b..bf021095 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -107,7 +107,7 @@ typedef struct { NM80211Mode mode; - NMActRequestGetSecretsCallId wifi_secrets_id; + NMActRequestGetSecretsCallId *wifi_secrets_id; guint periodic_source_id; guint link_timeout_id; @@ -1428,8 +1428,8 @@ build_hidden_probe_list (NMDeviceWifi *self) connections = nm_settings_get_connections_clone (nm_device_get_settings ((NMDevice *) self), &len, - hidden_filter_func, - NULL); + hidden_filter_func, NULL, + NULL, NULL); if (!connections[0]) return NULL; @@ -1786,7 +1786,7 @@ cleanup_supplicant_failures (NMDeviceWifi *self) static void wifi_secrets_cb (NMActRequest *req, - NMActRequestGetSecretsCallId call_id, + NMActRequestGetSecretsCallId *call_id, NMSettingsConnection *connection, GError *error, gpointer user_data) |