From 620adbcc7b2eb630299b9c0595b48e4823ccecde Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 9 Jun 2017 13:57:47 +0200 Subject: [PATCH] ppp: inline and drop trivial function remove_timeout_handler() (cherry picked from commit 0f16649ba27942e12c550449cc1669355118890f) --- src/ppp/nm-ppp-manager.c | 12 ++---------- 1 file 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 @@ -178,14 +178,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) { @@ -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));