diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/devices/nm-device-private.h | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/devices/nm-device-private.h')
| -rw-r--r-- | src/devices/nm-device-private.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index f34969ac..5010e906 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -24,9 +24,9 @@ #include "nm-device.h" -/* This file should only be used by subclasses of NMDevice */ +#include "nm-default.h" -#define NM_DEVICE_PLATFORM_DEVICE "platform-device" +/* This file should only be used by subclasses of NMDevice */ enum NMActStageReturn { NM_ACT_STAGE_RETURN_FAILURE = 0, @@ -91,7 +91,7 @@ gboolean nm_device_get_enslaved (NMDevice *device); NMDevice *nm_device_master_get_slave_by_ifindex (NMDevice *dev, int ifindex); void nm_device_master_check_slave_physical_port (NMDevice *self, NMDevice *slave, - guint64 log_domain); + NMLogDomain log_domain); void nm_device_set_carrier (NMDevice *self, gboolean carrier); @@ -106,4 +106,11 @@ void nm_device_set_wwan_ip6_config (NMDevice *device, NMIP6Config *config); gboolean nm_device_ipv6_sysctl_set (NMDevice *self, const char *property, const char *value); +#define NM_DEVICE_CLASS_DECLARE_TYPES(klass, conn_type, ...) \ + NM_DEVICE_CLASS (klass)->connection_type = conn_type; \ + { \ + static const NMLinkType link_types[] = { __VA_ARGS__, NM_LINK_TYPE_NONE }; \ + NM_DEVICE_CLASS (klass)->link_types = link_types; \ + } + #endif /* NM_DEVICE_PRIVATE_H */ |