fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-12 05:20:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: ignore PPP interface removal signals from udev

Browse source 
PPP interfaces are transient and created by their master interface
(usually for PPPoE or WWAN) and thus we don't want their removal
to affect their master device.  Unfortunately, that was happening
when a manual 'killall -TERM pppd' was run, which caused the
udev device removal signal, which caused NM to remove the master
WWAN device when udev signaled that the 'ppp' interface was gone.
This commit is contained in:
Dan Williams 2012-08-24 12:02:31 -05:00
parent 55542ffb3e
commit 722ce46aaa
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nm-manager.c
View file

@ -2123,6 +2123,14 @@ udev_device_removed_cb (NMUdevManager *manager,
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
NMDevice *device;
guint32 ifindex;
const char *iface = g_udev_device_get_name (udev_device);
/* Ignore PPP interfaces as they are the IP interface of a device,
* but they come and go when the device gets activated or deactivated.
* We don't want their transient nature to affect their master device.
*/
if (strncmp (iface, "ppp", 3) == 0)
return;
ifindex = g_udev_device_get_property_as_int (udev_device, "IFINDEX");
device = find_device_by_ifindex (self, ifindex);
@ -2131,7 +2139,7 @@ udev_device_removed_cb (NMUdevManager *manager,
* they may have already been removed from sysfs. Instead, we just
* have to fall back to the device's interface name.
*/
device = find_device_by_ip_iface (self, g_udev_device_get_name (udev_device));
device = find_device_by_ip_iface (self, iface);
}
if (device)