diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-02 16:33:30 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-11-08 11:33:32 +0100 |
| commit | fc18ff30cf74014e613e3c099a901e4e7ba82678 (patch) | |
| tree | dd50bf36cc18d051bd3b3f296e2866ea7987c0f4 | |
| parent | 9a7e668dbb552667e2545953a325d1d041fa0518 (diff) | |
| download | NetworkManager-fc18ff30cf74014e613e3c099a901e4e7ba82678.tar.gz | |
device: move nm_device_get_enabled() from schedule_activate_check() to nm_device_autoconnect_allowed()
| -rw-r--r-- | src/devices/nm-device.c | 3 | ||||
| -rw-r--r-- | src/nm-policy.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 3c1a2c7ea1..daba9d4d6c 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4304,6 +4304,9 @@ nm_device_autoconnect_allowed (NMDevice *self) && !klass->get_autoconnect_allowed (self)) return FALSE; + if (!nm_device_get_enabled (self)) + return FALSE; + /* Unrealized devices can always autoconnect. */ if (nm_device_is_real (self) && priv->state < NM_DEVICE_STATE_DISCONNECTED) return FALSE; diff --git a/src/nm-policy.c b/src/nm-policy.c index 3cfb1f7c4a..6d6bba8cf8 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1517,9 +1517,6 @@ schedule_activate_check (NMPolicy *self, NMDevice *device) if (nm_manager_get_state (priv->manager) == NM_STATE_ASLEEP) return; - if (!nm_device_get_enabled (device)) - return; - if (!nm_device_autoconnect_allowed (device)) return; |