diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-05-31 16:42:05 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-08 21:57:36 +0200 |
| commit | 84273a35162aaef50c9b9a4f1b565326989d370a (patch) | |
| tree | a5a5c9a5ec9b68c37f05484415a977e1bfd54a44 | |
| parent | dc1c8c22cc8034fe4c257d43b3c31196e9899326 (diff) | |
| download | NetworkManager-84273a35162aaef50c9b9a4f1b565326989d370a.tar.gz | |
device: rename priv->is_nm_owned to priv->nm_owned
Only a matter of taste, but nm_device_get_is_nm_owned() sounds
strange.
(cherry picked from commit 8cce037bf8078b7dbb8e3abc45f84ae6f7e9299c)
| -rw-r--r-- | src/devices/nm-device.c | 14 | ||||
| -rw-r--r-- | src/devices/nm-device.h | 2 | ||||
| -rw-r--r-- | src/nm-manager.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 3f30c94967..9b146d0f07 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -262,7 +262,7 @@ typedef struct _NMDevicePrivate { NMUtilsStableType current_stable_id_type:3; - bool is_nm_owned:1; /* whether the device is a device owned and created by NM */ + bool nm_owned:1; /* whether the device is a device owned and created by NM */ GHashTable * available_connections; char * hw_addr; @@ -2069,7 +2069,7 @@ nm_device_master_release_one_slave (NMDevice *self, NMDevice *slave, gboolean co static gboolean can_unmanaged_external_down (NMDevice *self) { - return !NM_DEVICE_GET_PRIVATE (self)->is_nm_owned + return !NM_DEVICE_GET_PRIVATE (self)->nm_owned && nm_device_is_software (self); } @@ -2809,9 +2809,9 @@ nm_device_create_and_realize (NMDevice *self, const NMPlatformLink *plink = NULL; /* Must be set before device is realized */ - priv->is_nm_owned = !nm_platform_link_get_by_ifname (nm_device_get_platform (self), priv->iface); + priv->nm_owned = !nm_platform_link_get_by_ifname (nm_device_get_platform (self), priv->iface); - _LOGD (LOGD_DEVICE, "create (is %snm-owned)", priv->is_nm_owned ? "" : "not "); + _LOGD (LOGD_DEVICE, "create (is %snm-owned)", priv->nm_owned ? "" : "not "); /* Create any resources the device needs */ if (NM_DEVICE_GET_CLASS (self)->create_and_realize) { @@ -8681,9 +8681,9 @@ _update_ip4_address (NMDevice *self) } gboolean -nm_device_get_is_nm_owned (NMDevice *self) +nm_device_is_nm_owned (NMDevice *self) { - return NM_DEVICE_GET_PRIVATE (self)->is_nm_owned; + return NM_DEVICE_GET_PRIVATE (self)->nm_owned; } /* @@ -8744,7 +8744,7 @@ delete_on_deactivate_check_and_schedule (NMDevice *self, int ifindex) if (ifindex <= 0) return; - if (!priv->is_nm_owned) + if (!priv->nm_owned) return; if (priv->queued_act_request) return; diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 5e6abb4a8f..27f5018c74 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -605,7 +605,7 @@ void nm_device_set_unmanaged_by_user_settings (NMDevice *self); void nm_device_set_unmanaged_by_user_udev (NMDevice *self); void nm_device_set_unmanaged_by_quitting (NMDevice *device); -gboolean nm_device_get_is_nm_owned (NMDevice *device); +gboolean nm_device_is_nm_owned (NMDevice *device); gboolean nm_device_has_capability (NMDevice *self, NMDeviceCapabilities caps); diff --git a/src/nm-manager.c b/src/nm-manager.c index 939e5760e5..fadfa84548 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1858,7 +1858,7 @@ 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_get_is_nm_owned (device)) + if (nm_device_is_nm_owned (device)) return FALSE; if (!nm_device_get_managed (device, FALSE)) |