summaryrefslogtreecommitdiff
path: root/src/devices/nm-device.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-07-17 15:46:12 -0400
committerDan Winship <danw@redhat.com>2015-01-26 12:32:13 -0500
commitd439601ae0bd8813c0ccad57982bad6a29d3df65 (patch)
tree9087bd96ab7c0f5d34f77c704aacdebe8a8ac6bc /src/devices/nm-device.h
parentbdd24f483aae02459caef00120d65a1459d1573e (diff)
downloadNetworkManager-danw/no-default-unmanaged.tar.gz
core: drop "default-unmanaged" devicesdanw/no-default-unmanaged
"default-unmanaged" was added for NMDeviceGeneric, so that they could be unmanaged by default, but still activatable under the correct arcane circumstances. However, NMDeviceGeneric will only allow itself connections with type "generic" to be activated on it anyway, so there is no chance of a device being accidentally activated on it, so all of the unmanaged-default handling just complicates the code for no reason.
Diffstat (limited to 'src/devices/nm-device.h')
-rw-r--r--src/devices/nm-device.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index e6f07f2ef3..df9dd27e68 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -310,7 +310,6 @@ RfKillType nm_device_get_rfkill_type (NMDevice *device);
/**
* NMUnmanagedFlags:
* @NM_UNMANAGED_NONE: placeholder value
- * @NM_UNMANAGED_DEFAULT: %TRUE when unmanaged by default (ie, Generic devices)
* @NM_UNMANAGED_INTERNAL: %TRUE when unmanaged by internal decision (ie,
* because NM is sleeping or not managed for some other reason)
* @NM_UNMANAGED_USER: %TRUE when unmanaged by user decision (via unmanaged-specs)
@@ -319,7 +318,6 @@ RfKillType nm_device_get_rfkill_type (NMDevice *device);
*/
typedef enum {
NM_UNMANAGED_NONE = 0x00,
- NM_UNMANAGED_DEFAULT = 0x01,
NM_UNMANAGED_INTERNAL = 0x02,
NM_UNMANAGED_USER = 0x04,
NM_UNMANAGED_PARENT = 0x08,