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

core: fix bug with ignore-carrier and master/slave devices (rh #1083521)

Browse source 
Even ignore-carrier devices need to be aware of carrier-up events so
they can continue DHCP when the link comes up.  They just ignore all
carrier-down events.
This commit is contained in:
Dan Williams 2014-04-02 09:15:54 -05:00
parent ece92fe67a
commit 0b664ad4a4
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1008,11 +1008,9 @@ carrier_changed (NMDevice *device, gboolean carrier)
nm_device_recheck_available_connections (device);
if (priv->ignore_carrier) {
/* Ignore all carrier-off, and ignore carrier-on on connected devices */
if (!carrier || priv->state > NM_DEVICE_STATE_DISCONNECTED)
return;
}
/* ignore-carrier devices ignore all carrier-down events */
if (priv->ignore_carrier && !carrier)
return;
if (nm_device_is_master (device)) {
/* Bridge/bond/team carrier does not affect its own activation,