diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-08-22 12:51:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-08-28 16:27:00 +0200 |
| commit | 86f8f5a71c52af36e8e8d73e27612d6588d828c3 (patch) | |
| tree | 11c35d1f5c01d0681c7fe2a39e586ed8135e0ea3 /src | |
| parent | 51ddbda5d24eaa95f7e17c803f661d4369e38e2b (diff) | |
| download | NetworkManager-86f8f5a71c52af36e8e8d73e27612d6588d828c3.tar.gz | |
device/wifi-p2p: inline and drop local function cleanup_p2p_connect_attempt()
It has only one caller. It's clearer to do the cleanup right there.
Diffstat (limited to 'src')
| -rw-r--r-- | src/devices/wifi/nm-device-wifi-p2p.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/devices/wifi/nm-device-wifi-p2p.c index ef6df10243..fe2f7bc4d8 100644 --- a/src/devices/wifi/nm-device-wifi-p2p.c +++ b/src/devices/wifi/nm-device-wifi-p2p.c @@ -399,21 +399,6 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) return NM_ACT_STAGE_RETURN_SUCCESS; } -static void -cleanup_p2p_connect_attempt (NMDeviceWifiP2P *self, gboolean disconnect) -{ - NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (self); - - nm_clear_g_source (&priv->sup_timeout_id); - nm_clear_g_source (&priv->peer_missing_id); - - if (priv->mgmt_iface) - nm_supplicant_interface_p2p_cancel_connect (priv->mgmt_iface); - - if (disconnect && priv->group_iface) - nm_supplicant_interface_p2p_disconnect (priv->group_iface); -} - /* * supplicant_connection_timeout_cb * @@ -609,9 +594,17 @@ static void deactivate (NMDevice *device) { NMDeviceWifiP2P *self = NM_DEVICE_WIFI_P2P (device); + NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (self); int ifindex = nm_device_get_ip_ifindex (device); - cleanup_p2p_connect_attempt (self, TRUE); + nm_clear_g_source (&priv->sup_timeout_id); + nm_clear_g_source (&priv->peer_missing_id); + + if (priv->mgmt_iface) + nm_supplicant_interface_p2p_cancel_connect (priv->mgmt_iface); + + if (priv->group_iface) + nm_supplicant_interface_p2p_disconnect (priv->group_iface); /* Clear any critical protocol notification in the Wi-Fi stack */ if (ifindex > 0) |