diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-07 22:22:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-08 14:27:12 +0200 |
| commit | fe5252ec05cb40845a4b4ace7aa2501ed955864d (patch) | |
| tree | 8f9aea6a4e4561058cfa3e3a4bf605699b872de5 | |
| parent | 44a664566c3d3b3fe2b76d0ee5b8d334622df788 (diff) | |
| download | NetworkManager-fe5252ec05cb40845a4b4ace7aa2501ed955864d.tar.gz | |
core: allow assuming connections on "nm-owned" software devices
Especially now we load the nm-owned flag from run-state. We very much want to
assume connections on such devices.
(cherry picked from commit d56e313366f82c40485a8a4454596199267c069e)
| -rw-r--r-- | src/nm-manager.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index acf1b2a0ce..bcfac44ddc 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1858,9 +1858,6 @@ recheck_assume_connection (NMManager *self, g_return_val_if_fail (NM_IS_MANAGER (self), FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); - if (nm_device_is_nm_owned (device)) - return FALSE; - if (!nm_device_get_managed (device, FALSE)) return FALSE; |