diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-09 13:57:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-09 15:42:49 +0200 |
| commit | 0f16649ba27942e12c550449cc1669355118890f (patch) | |
| tree | ec80cd942bf427d9610b9cd0ce36d1ffdad70561 | |
| parent | 58c8140acb0b89bf6e9fecc70c2ae86b266f2eff (diff) | |
| download | NetworkManager-0f16649ba27942e12c550449cc1669355118890f.tar.gz | |
ppp: inline and drop trivial function remove_timeout_handler()
| -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)); |