From c3fc96058741bfc8479b2fbab74f815a03f941a5 Mon Sep 17 00:00:00 2001 From: Frederic Danis Date: Thu, 17 May 2018 17:33:45 +0200 Subject: [PATCH] devices/wwan: Stop PPP manager in deactivate_cleanup() When ModemManager exits, pppd is not killed due to nm_exported_object not unexported (ppp_manager refcount = 2). Call to nm_ppp_manager_stop_sync() allows to correctly clean ppp_manager before calling g_clear_object(), as this is done in nm-device-ethernet.c and nm-device-adsl.c. [thaller@redhat.com: rebase and adjust patch] https://bugzilla.gnome.org/show_bug.cgi?id=796108 https://mail.gnome.org/archives/networkmanager-list/2018-May/msg00015.html (cherry picked from commit 227e179560203346dbae822af4d22305ff22b0d7) --- src/devices/wwan/nm-modem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 4d85d1d124..fcb8cea05e 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1097,6 +1097,7 @@ deactivate_cleanup (NMModem *self, NMDevice *device) if (priv->ppp_manager) { g_signal_handlers_disconnect_by_data (priv->ppp_manager, self); + nm_ppp_manager_stop_sync (priv->ppp_manager); g_clear_object (&priv->ppp_manager); }