fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 04:40:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: merge branch 'bg/ppp-device-fixes-rh1268617'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1268617
This commit is contained in:
Beniamino Galvani 2016-01-05 18:37:07 +01:00
commit e72b8aa923
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/devices/nm-device.c
View file

@ -1601,12 +1601,13 @@ device_ip_link_changed (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const NMPlatformLink *pllink;
int ip_ifindex;
priv->device_ip_link_changed_id = 0;
ip_ifindex = nm_device_get_ip_ifindex (self);
pllink = nm_platform_link_get (NM_PLATFORM_GET, ip_ifindex);
if (!priv->ip_ifindex)
return G_SOURCE_REMOVE;
pllink = nm_platform_link_get (NM_PLATFORM_GET, priv->ip_ifindex);
if (!pllink)
return G_SOURCE_REMOVE;

1
src/ppp-manager/nm-ppp-manager.c
View file

@ -800,6 +800,7 @@ ppp_watch_cb (GPid pid, gint status, gpointer user_data)
nm_log_dbg (LOGD_PPP, "pppd pid %d cleaned up", priv->pid);
priv->pid = 0;
priv->ppp_watch_id = 0;
g_signal_emit (manager, signals[STATE_CHANGED], 0, NM_PPP_STATUS_DEAD);
}