fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 13:00:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: don't try to get carrier detection support when unrealizing

Browse source 
get_generic_capabilities() is called with a 0 ifindex when unrealizing:
don't call nm_platform_link_supports_carrier_detect() is such case.
This commit is contained in:
Beniamino Galvani 2016-12-19 08:20:05 +01:00
parent 0dfb5d2452
commit fa15543179
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/devices/nm-device-ethernet.c
View file

@ -306,14 +306,18 @@ static NMDeviceCapabilities
get_generic_capabilities (NMDevice *device)
{
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (device);
int ifindex = nm_device_get_ifindex (device);
if (nm_platform_link_supports_carrier_detect (NM_PLATFORM_GET, nm_device_get_ifindex (device)))
return NM_DEVICE_CAP_CARRIER_DETECT;
else {
_LOGI (LOGD_PLATFORM, "driver '%s' does not support carrier detection.",
nm_device_get_driver (device));
return NM_DEVICE_CAP_NONE;
if (ifindex > 0) {
if (nm_platform_link_supports_carrier_detect (NM_PLATFORM_GET, ifindex))
return NM_DEVICE_CAP_CARRIER_DETECT;
else {
_LOGI (LOGD_PLATFORM, "driver '%s' does not support carrier detection.",
nm_device_get_driver (device));
}
}
return NM_DEVICE_CAP_NONE;
}
static guint32

4
src/devices/nm-device-generic.c
View file

@ -56,7 +56,9 @@ G_DEFINE_TYPE (NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE)
static NMDeviceCapabilities
get_generic_capabilities (NMDevice *dev)
{
if (nm_platform_link_supports_carrier_detect (NM_PLATFORM_GET, nm_device_get_ifindex (dev)))
int ifindex = nm_device_get_ifindex (dev);
if (ifindex > 0 && nm_platform_link_supports_carrier_detect (NM_PLATFORM_GET, ifindex))
return NM_DEVICE_CAP_CARRIER_DETECT;
else
return NM_DEVICE_CAP_NONE;