Commit 0b664ad4 authored by Dan Williams's avatar Dan Williams
Browse files

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

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.
parent ece92fe6
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment