diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch')
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch deleted file mode 100644 index 41f288281..000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 8204c2a1968f757599c5ebec9a85efaacb0e522a Mon Sep 17 00:00:00 2001 | ||
2 | From: Beniamino Galvani <bgalvani@redhat.com> | ||
3 | Date: Mon, 4 Jan 2016 14:18:02 +0100 | ||
4 | Subject: [PATCH 2/7] ppp-manager: clear @ppp_watch_id upon pppd termination | ||
5 | |||
6 | Set @ppp_watch_id to zero upon pppd termination, otherwise the call to | ||
7 | g_source_remove(priv->ppp_watch_id) in dispose() could trigger a failed | ||
8 | assertion. | ||
9 | |||
10 | (cherry picked from commit 5f93f0101538db39efe0f9ea2316e63bff953bf0) | ||
11 | --- | ||
12 | src/ppp-manager/nm-ppp-manager.c | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c | ||
16 | index d27b262..85ca9c5 100644 | ||
17 | --- a/src/ppp-manager/nm-ppp-manager.c | ||
18 | +++ b/src/ppp-manager/nm-ppp-manager.c | ||
19 | @@ -828,6 +828,7 @@ ppp_watch_cb (GPid pid, gint status, gpointer user_data) | ||
20 | |||
21 | nm_log_dbg (LOGD_PPP, "pppd pid %d cleaned up", priv->pid); | ||
22 | priv->pid = 0; | ||
23 | + priv->ppp_watch_id = 0; | ||
24 | g_signal_emit (manager, signals[STATE_CHANGED], 0, NM_PPP_STATUS_DEAD); | ||
25 | } | ||
26 | |||
27 | -- | ||
28 | 2.5.0 | ||
29 | |||