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

fix: drop unused @NM_UNMANAGED_BY_TYPE

Browse source
This commit is contained in:
Thomas Haller 2022-07-26 16:56:45 +02:00
parent d71f711b1a
commit c0b4961106
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/devices/nm-device.c
View file

@ -14028,7 +14028,6 @@ NM_UTILS_FLAGS2STR_DEFINE(nm_unmanaged_flags2str,
NM_UTILS_FLAGS2STR(NM_UNMANAGED_SLEEPING, "sleeping"),
NM_UTILS_FLAGS2STR(NM_UNMANAGED_QUITTING, "quitting"),
NM_UTILS_FLAGS2STR(NM_UNMANAGED_PARENT, "parent"),
NM_UTILS_FLAGS2STR(NM_UNMANAGED_BY_TYPE, "by-type"),
NM_UTILS_FLAGS2STR(NM_UNMANAGED_PLATFORM_INIT, "platform-init"),
NM_UTILS_FLAGS2STR(NM_UNMANAGED_USER_EXPLICIT, "user-explicit"),
NM_UTILS_FLAGS2STR(NM_UNMANAGED_BY_DEFAULT, "by-default"),

20
src/core/devices/nm-device.h
View file

@ -564,7 +564,6 @@ void nm_device_copy_ip6_dns_config(NMDevice *self, NMDevice *from_device);
* @NM_UNMANAGED_SLEEPING: %TRUE when unmanaged because NM is sleeping.
* @NM_UNMANAGED_QUITTING: %TRUE when unmanaged because NM is shutting down.
* @NM_UNMANAGED_PARENT: %TRUE when unmanaged due to parent device being unmanaged
* @NM_UNMANAGED_BY_TYPE: %TRUE for unmanaging device by type, like loopback.
* @NM_UNMANAGED_PLATFORM_INIT: %TRUE when unmanaged because platform link not
* yet initialized. Unrealized device are also unmanaged for this reason.
* @NM_UNMANAGED_USER_EXPLICIT: %TRUE when unmanaged by explicit user decision
@ -595,20 +594,19 @@ typedef enum {
NM_UNMANAGED_SLEEPING = (1LL << 0),
NM_UNMANAGED_QUITTING = (1LL << 1),
NM_UNMANAGED_PARENT = (1LL << 2),
NM_UNMANAGED_BY_TYPE = (1LL << 3),
NM_UNMANAGED_PLATFORM_INIT = (1LL << 4),
NM_UNMANAGED_USER_EXPLICIT = (1LL << 5),
NM_UNMANAGED_USER_SETTINGS = (1LL << 6),
NM_UNMANAGED_PLATFORM_INIT = (1LL << 3),
NM_UNMANAGED_USER_EXPLICIT = (1LL << 4),
NM_UNMANAGED_USER_SETTINGS = (1LL << 5),
/* These flags can be non-effective and be overwritten
* by other flags. */
NM_UNMANAGED_BY_DEFAULT = (1LL << 7),
NM_UNMANAGED_USER_CONF = (1LL << 8),
NM_UNMANAGED_USER_UDEV = (1LL << 9),
NM_UNMANAGED_EXTERNAL_DOWN = (1LL << 10),
NM_UNMANAGED_IS_SLAVE = (1LL << 11),
NM_UNMANAGED_BY_DEFAULT = (1LL << 6),
NM_UNMANAGED_USER_CONF = (1LL << 7),
NM_UNMANAGED_USER_UDEV = (1LL << 8),
NM_UNMANAGED_EXTERNAL_DOWN = (1LL << 9),
NM_UNMANAGED_IS_SLAVE = (1LL << 10),
NM_UNMANAGED_ALL = ((1LL << 12) - 1),
NM_UNMANAGED_ALL = ((1LL << 11) - 1),
} NMUnmanagedFlags;
typedef enum {