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

device/wifi-p2p: make act_stage1_prepare() re-entrant

Browse source 
Don't clear and reschedule finding of p2p peer if called multiple
times during (the same) activation.
This commit is contained in:
Thomas Haller 2019-08-22 08:18:09 +02:00
parent df086f5366
commit 1f7e0f1d1f
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/devices/wifi/nm-device-wifi-p2p.c
View file

@ -369,13 +369,10 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason)
NMDeviceWifiP2P *self = NM_DEVICE_WIFI_P2P (device);
NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (self);
NMActStageReturn ret;
NMActRequest *req;
NMConnection *connection;
NMSettingWifiP2P *s_wifi_p2p;
NMWifiP2PPeer *peer;
nm_clear_g_source (&priv->sup_timeout_id);
ret = NM_DEVICE_CLASS (nm_device_wifi_p2p_parent_class)->act_stage1_prepare (device, out_failure_reason);
if (ret != NM_ACT_STAGE_RETURN_SUCCESS)
return ret;
@ -385,10 +382,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason)
return NM_ACT_STAGE_RETURN_FAILURE;
}
req = nm_device_get_act_request (NM_DEVICE (self));
g_return_val_if_fail (req, NM_ACT_STAGE_RETURN_FAILURE);
connection = nm_act_request_get_applied_connection (req);
connection = nm_device_get_applied_connection (NM_DEVICE (self));
g_return_val_if_fail (connection, NM_ACT_STAGE_RETURN_FAILURE);
s_wifi_p2p = NM_SETTING_WIFI_P2P (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIFI_P2P));
@ -397,12 +391,13 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason)
peer = nm_wifi_p2p_peers_find_first_compatible (&priv->peers_lst_head, connection);
if (!peer) {
/* Set up a timeout on the find attempt and run a find for the same period of time */
priv->sup_timeout_id = g_timeout_add_seconds (10,
supplicant_find_timeout_cb,
self);
nm_supplicant_interface_p2p_start_find (priv->mgmt_iface, 10);
if (priv->sup_timeout_id == 0) {
priv->sup_timeout_id = g_timeout_add_seconds (10,
supplicant_find_timeout_cb,
self);
nm_supplicant_interface_p2p_start_find (priv->mgmt_iface, 10);
}
return NM_ACT_STAGE_RETURN_POSTPONE;
}