diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-02-12 14:39:10 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-02-12 14:39:12 +0100 |
| commit | 0198c68e53e24c7de3a9452d9f2177622f9ef6a7 (patch) | |
| tree | 3eeac1c7b8c06c5cc5b40a360bcacd231c81da90 | |
| parent | 43710a9a1deaf88329425300079789cb1312d806 (diff) | |
| download | NetworkManager-0198c68e53e24c7de3a9452d9f2177622f9ef6a7.tar.gz | |
device: move supplicant_timeout_id into supplicant struct in NMDeviceEthernetPrivateth/supplicant-cleanup-2
The supplicant struct is there to group related variables.
Move supplicant_timeout_id there.
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 9d29a0e228..bdb46844c6 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -82,9 +82,9 @@ typedef struct _NMDeviceEthernetPrivate { /* Timeouts and idles */ guint con_timeout_id; - } supplicant; - guint supplicant_timeout_id; + guint timeout_id; + } supplicant; NMActRequestGetSecretsCallId *wired_secrets_id; @@ -399,7 +399,7 @@ supplicant_interface_release (NMDeviceEthernet *self) { NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self); - nm_clear_g_source (&priv->supplicant_timeout_id); + nm_clear_g_source (&priv->supplicant.timeout_id); nm_clear_g_source (&priv->supplicant.con_timeout_id); nm_clear_g_signal_handler (priv->supplicant.iface, &priv->supplicant.iface_state_id); nm_clear_g_signal_handler (priv->supplicant.iface, &priv->supplicant.auth_state_id); @@ -546,7 +546,7 @@ link_timeout_cb (gpointer user_data) NMConnection *applied_connection; const char *setting_name; - priv->supplicant_timeout_id = 0; + priv->supplicant.timeout_id = 0; req = nm_device_get_act_request (device); @@ -674,7 +674,7 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface, } break; case NM_SUPPLICANT_INTERFACE_STATE_COMPLETED: - nm_clear_g_source (&priv->supplicant_timeout_id); + nm_clear_g_source (&priv->supplicant.timeout_id); nm_clear_g_source (&priv->supplicant.con_timeout_id); /* If this is the initial association during device activation, @@ -689,8 +689,8 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface, case NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED: if ((devstate == NM_DEVICE_STATE_ACTIVATED) || nm_device_is_activating (device)) { /* Start the link timeout so we allow some time for reauthentication */ - if (!priv->supplicant_timeout_id) - priv->supplicant_timeout_id = g_timeout_add_seconds (15, link_timeout_cb, device); + if (!priv->supplicant.timeout_id) + priv->supplicant.timeout_id = g_timeout_add_seconds (15, link_timeout_cb, device); } break; case NM_SUPPLICANT_INTERFACE_STATE_DOWN: |