summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Danis <frederic.danis.external@sigfox.com>2018-05-17 17:33:45 +0200
committerThomas Haller <thaller@redhat.com>2018-05-18 09:51:29 +0200
commit227e179560203346dbae822af4d22305ff22b0d7 (patch)
treefb4b94286931fc5f56ab74e26a7d5f8e177a166c
parent641c111277802da604de419a000ed212085c7282 (diff)
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
-rw-r--r--src/devices/wwan/nm-modem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index 80336d7209..c49b1aac6a 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -1131,6 +1131,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);
}