diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-05-12 16:21:55 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-05-15 17:38:47 +0200 |
| commit | a07c6255a02e098dae934ee0e6765e1ce5b927ae (patch) | |
| tree | 5a83d60240c9c3426557de002f3723fb826128c0 | |
| parent | 5a7374d8be33086a5c00a450a472069595ba1734 (diff) | |
| download | NetworkManager-a07c6255a02e098dae934ee0e6765e1ce5b927ae.tar.gz | |
device/trivial: rename functions related to "carrier"
| -rw-r--r-- | src/devices/nm-device.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index e445a80d10..49becc994e 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2170,6 +2170,8 @@ nm_device_update_dynamic_ip_setup (NMDevice *self) } } +/*****************************************************************************/ + static void carrier_changed_notify (NMDevice *self, gboolean carrier) { @@ -2247,7 +2249,7 @@ carrier_changed (NMDevice *self, gboolean carrier) #define LINK_DISCONNECT_DELAY 4 static gboolean -link_disconnect_action_cb (gpointer user_data) +carrier_disconnected_action_cb (gpointer user_data) { NMDevice *self = NM_DEVICE (user_data); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); @@ -2262,7 +2264,7 @@ link_disconnect_action_cb (gpointer user_data) } static void -link_disconnect_action_cancel (NMDevice *self) +carrier_disconnected_action_cancel (NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); @@ -2287,7 +2289,7 @@ nm_device_set_carrier (NMDevice *self, gboolean carrier) if (priv->carrier) { _LOGI (LOGD_DEVICE, "link connected"); - link_disconnect_action_cancel (self); + carrier_disconnected_action_cancel (self); carrier_changed (self, TRUE); if (nm_clear_g_source (&priv->carrier_wait_id)) { @@ -2300,12 +2302,14 @@ nm_device_set_carrier (NMDevice *self, gboolean carrier) carrier_changed (self, FALSE); } else { priv->carrier_defer_id = g_timeout_add_seconds (LINK_DISCONNECT_DELAY, - link_disconnect_action_cb, self); + carrier_disconnected_action_cb, self); _LOGD (LOGD_DEVICE, "link disconnected (deferring action for %d seconds) (id=%u)", LINK_DISCONNECT_DELAY, priv->carrier_defer_id); } } +/*****************************************************************************/ + static void device_recheck_slave_status (NMDevice *self, const NMPlatformLink *plink) { @@ -13720,7 +13724,7 @@ dispose (GObject *object) nm_clear_g_source (&priv->stats.timeout_id); - link_disconnect_action_cancel (self); + carrier_disconnected_action_cancel (self); if (priv->ifindex > 0) { priv->ifindex = 0; |