diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-05-12 11:14:08 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-05-12 11:14:13 +0200 |
| commit | 061215dbe9a6c9791c17b7600166b05e08c8e083 (patch) | |
| tree | f45b96bc594ac65cdc0a134d4599adc89d198932 | |
| parent | d552a175b78aac4a87fa51fbdcb2c8363d067aef (diff) | |
| download | NetworkManager-061215dbe9a6c9791c17b7600166b05e08c8e083.tar.gz | |
fixup! device: fix multiple subscriptions to config-changed signal for ignore-carrier
| -rw-r--r-- | src/devices/nm-device.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 656c136b6c..8f3ecc12c7 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -10781,11 +10781,9 @@ _set_state_full (NMDevice *self, case NM_DEVICE_STATE_DEACTIVATING: _cancel_activation (self); - if (nm_device_has_capability (self, NM_DEVICE_CAP_CARRIER_DETECT)) { - /* We cache the ignore_carrier state to not react on config-reloads while the connection - * is active. But on deactivating, reset the ignore-carrier flag to the current state. */ - priv->ignore_carrier = nm_config_data_get_ignore_carrier (NM_CONFIG_GET_DATA, self); - } + /* We cache the ignore_carrier state to not react on config-reloads while the connection + * is active. But on deactivating, reset the ignore-carrier flag to the current state. */ + priv->ignore_carrier = nm_config_data_get_ignore_carrier (NM_CONFIG_GET_DATA, self); if (quitting) { nm_dispatcher_call_sync (DISPATCHER_ACTION_PRE_DOWN, |