diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-07 22:22:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-08 22:00:56 +0200 |
| commit | 122be86c58b39b661b1cf466d5616d6f0006744e (patch) | |
| tree | 8f9aea6a4e4561058cfa3e3a4bf605699b872de5 | |
| parent | 8e25de8ab360fc973d7222685f107b81dd872dc1 (diff) | |
| download | NetworkManager-122be86c58b39b661b1cf466d5616d6f0006744e.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 6a7b51f79bf93889665f9f6eb1ebbd4920535e24)
| -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; |