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

device: don't check_carrier() during bring_up()

Browse source 
Don't check the carrier state inside the virtual function bring_up().
This commit is contained in:
Thomas Haller 2016-05-09 18:30:06 +02:00
parent f3df854333
commit 8f77ecad8a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8658,6 +8658,10 @@ nm_device_bring_up (NMDevice *self, gboolean block, gboolean *no_firmware)
return FALSE; return FALSE;
} }
/* Store carrier immediately. */
if (nm_device_has_capability (self, NM_DEVICE_CAP_CARRIER_DETECT))
check_carrier (self);
device_is_up = nm_device_is_up (self); device_is_up = nm_device_is_up (self);
if (block && !device_is_up) { if (block && !device_is_up) {
int ifindex = nm_device_get_ip_ifindex (self); int ifindex = nm_device_get_ip_ifindex (self);
@ -8711,10 +8715,6 @@ bring_up (NMDevice *self, gboolean *no_firmware)
result = nm_platform_link_set_up (NM_PLATFORM_GET, ifindex, no_firmware); result = nm_platform_link_set_up (NM_PLATFORM_GET, ifindex, no_firmware);
/* Store carrier immediately. */
if (result && nm_device_has_capability (self, NM_DEVICE_CAP_CARRIER_DETECT))
check_carrier (self);
return result; return result;
} }