diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-09-11 11:03:28 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-09-11 11:13:03 +0200 |
| commit | 60c86828b7d3858e130084a27e260eb20551a473 (patch) | |
| tree | 97d918df94a697e939150e89023ae686759e79ce /src/devices/nm-device.c | |
| parent | d39df457c7618ace1e1daefb8bb41d23676e1dcd (diff) | |
| parent | 857b32ce16c33d2fb191da77e9a3f3b542714d74 (diff) | |
Merge remote-tracking branch 'salsa/master'
Diffstat (limited to 'src/devices/nm-device.c')
| -rw-r--r-- | src/devices/nm-device.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index f07c4f09..823cf48a 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4151,11 +4151,12 @@ nm_device_create_and_realize (NMDevice *self, nm_auto_nmpobj const NMPObject *plink_keep_alive = NULL; NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); const NMPlatformLink *plink; + gboolean nm_owned; /* Must be set before device is realized */ plink = nm_platform_link_get_by_ifname (nm_device_get_platform (self), priv->iface); - priv->nm_owned = !plink || !link_type_compatible (self, plink->type, NULL, NULL); - _LOGD (LOGD_DEVICE, "create (is %snm-owned)", priv->nm_owned ? "" : "not "); + nm_owned = !plink || !link_type_compatible (self, plink->type, NULL, NULL); + _LOGD (LOGD_DEVICE, "create (is %snm-owned)", nm_owned ? "" : "not "); plink = NULL; /* Create any resources the device needs */ @@ -4168,6 +4169,8 @@ nm_device_create_and_realize (NMDevice *self, } } + priv->nm_owned = nm_owned; + realize_start_setup (self, plink, FALSE, /* assume_state_guess_assume */ |