diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-09 13:57:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-09 16:16:42 +0200 |
| commit | 620adbcc7b2eb630299b9c0595b48e4823ccecde (patch) | |
| tree | 92e999f03796f212851058c3398d553a39c9e72d | |
| parent | 5e656b5872e6399d6536e3fb043ca9c63e298774 (diff) | |
| download | NetworkManager-620adbcc7b2eb630299b9c0595b48e4823ccecde.tar.gz | |
ppp: inline and drop trivial function remove_timeout_handler()
(cherry picked from commit 0f16649ba27942e12c550449cc1669355118890f)
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index fd0b991490..efaf73af5e 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -179,14 +179,6 @@ monitor_stats (NMPPPManager *manager) /*****************************************************************************/ static void -remove_timeout_handler (NMPPPManager *manager) -{ - NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (manager); - - nm_clear_g_source (&priv->ppp_timeout_handler); -} - -static void cancel_get_secrets (NMPPPManager *self) { NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (self); @@ -415,7 +407,7 @@ impl_ppp_manager_set_ip4_config (NMPPPManager *manager, _LOGI ("(IPv4 Config Get) reply received."); - remove_timeout_handler (manager); + nm_clear_g_source (&priv->ppp_timeout_handler); config = nm_ip4_config_new (nm_platform_link_get_ifindex (NM_PLATFORM_GET, priv->ip_iface)); @@ -511,7 +503,7 @@ impl_ppp_manager_set_ip6_config (NMPPPManager *manager, _LOGI ("(IPv6 Config Get) reply received."); - remove_timeout_handler (manager); + nm_clear_g_source (&priv->ppp_timeout_handler); config = nm_ip6_config_new (nm_platform_link_get_ifindex (NM_PLATFORM_GET, priv->ip_iface)); |