fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-29 17:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: return the unmanaged flags from nm_device_get_unmanaged_flags()

Browse source
This commit is contained in:
Thomas Haller 2015-11-05 02:41:42 +01:00
parent 4c9ffa8dba
commit 4f5cd099be
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/devices/nm-device.c
View file

@ -1526,7 +1526,7 @@ device_link_changed (NMDevice *self)
/* Manage externally-created software interfaces only when they are IFF_UP */
g_assert (priv->ifindex > 0);
if (NM_DEVICE_GET_CLASS (self)->can_unmanaged_external_down (self)) {
gboolean external_down = nm_device_get_unmanaged_flags (self, NM_UNMANAGED_EXTERNAL_DOWN);
gboolean external_down = !!nm_device_get_unmanaged_flags (self, NM_UNMANAGED_EXTERNAL_DOWN);
if (external_down && NM_FLAGS_HAS (info.flags, IFF_UP)) {
if (nm_device_get_state (self) < NM_DEVICE_STATE_DISCONNECTED) {
@ -8260,13 +8260,14 @@ nm_device_get_managed (NMDevice *self)
/**
* nm_device_get_unmanaged_flags():
* @self: the #NMDevice
* @flag: return only the selected flags
*
* Returns: %TRUE if the device is unmanaged for @flag.
* Returns: the unmanage flags of the device (filtered with @flag)
*/
gboolean
NMUnmanagedFlags
nm_device_get_unmanaged_flags (NMDevice *self, NMUnmanagedFlags flag)
{
return NM_FLAGS_ANY (NM_DEVICE_GET_PRIVATE (self)->unmanaged_flags, flag);
return NM_DEVICE_GET_PRIVATE (self)->unmanaged_flags & flag;
}
/**
@ -8278,7 +8279,7 @@ nm_device_get_unmanaged_flags (NMDevice *self, NMUnmanagedFlags flag)
static gboolean
nm_device_get_default_unmanaged (NMDevice *self)
{
return nm_device_get_unmanaged_flags (self, NM_UNMANAGED_DEFAULT);
return !!nm_device_get_unmanaged_flags (self, NM_UNMANAGED_DEFAULT);
}
static void

2
src/devices/nm-device.h
View file

@ -473,7 +473,7 @@ typedef enum { /*< skip >*/
} NMUnmanagedFlags;
gboolean nm_device_get_managed (NMDevice *device);
gboolean nm_device_get_unmanaged_flags (NMDevice *device, NMUnmanagedFlags flag);
NMUnmanagedFlags nm_device_get_unmanaged_flags (NMDevice *device, NMUnmanagedFlags flag);
void nm_device_set_unmanaged_flags (NMDevice *device,
NMUnmanagedFlags flag,
gboolean unmanaged,