summaryrefslogtreecommitdiff
path: root/src/devices/nm-device-private.h
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-09-05 08:50:02 -0500
committerDan Williams <dcbw@redhat.com>2015-07-31 14:06:09 -0500
commite8139f56c26ae3bcc5e14abdb29970ae07e93299 (patch)
tree202fe6b86700440bae1d4161c3daf49c34d4dd09 /src/devices/nm-device-private.h
parentcf455aa0e20f16b109a4cd4e76e26bb4f698d97e (diff)
downloadNetworkManager-e8139f56c26ae3bcc5e14abdb29970ae07e93299.tar.gz
core: split device creation and device setup (bgo #737458)
Future patches will create devices long before they are backed by kernel resources, so we need to split NMDevice object creation from actual setup based on the backing resources. This patch combines the NMDeviceFactory's new_link() and create_virtual_device_for_connection() class methods into a single create_device() method that simply creates an unrealized NMDevice object; this method is not expected to fail unless the device is supposed to be ignored. This also means that the NMDevice 'platform-device' property is removed, because a platform link object may not be available at NMDevice object creation time. After the device is created, it is then "realized" at some later time from a platform link (for existing/hardware devices via the realize() method) or from an NMConnection (for newly created software devices via the create_and_realize() NMDeviceClass methods). https://bugzilla.gnome.org/show_bug.cgi?id=737458
Diffstat (limited to 'src/devices/nm-device-private.h')
-rw-r--r--src/devices/nm-device-private.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index 19e00e01cb..c4e3fe0de3 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -28,8 +28,6 @@
/* This file should only be used by subclasses of NMDevice */
-#define NM_DEVICE_PLATFORM_DEVICE "platform-device"
-
enum NMActStageReturn {
NM_ACT_STAGE_RETURN_FAILURE = 0,
NM_ACT_STAGE_RETURN_SUCCESS, /* Activation stage done */