diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
| commit | 54de7f04d1fac5f29fd54ec4120ba2fc4f9b5714 (patch) | |
| tree | 87729385ff8de744dc44d0b4cc75916494b2fd38 /libnm-util/NetworkManager.h | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
| parent | 329b15110c4b183d7a47552abe3a6a6ff933e817 (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'libnm-util/NetworkManager.h')
| -rw-r--r-- | libnm-util/NetworkManager.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index 5e1c3f9f..2aa2e357 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -66,7 +66,6 @@ #define NM_DBUS_INTERFACE_DEVICE_VXLAN NM_DBUS_INTERFACE_DEVICE ".Vxlan" #define NM_DBUS_INTERFACE_DEVICE_GRE NM_DBUS_INTERFACE_DEVICE ".Gre" - #define NM_DBUS_IFACE_SETTINGS "org.freedesktop.NetworkManager.Settings" #define NM_DBUS_PATH_SETTINGS "/org/freedesktop/NetworkManager/Settings" @@ -196,7 +195,6 @@ typedef enum { /*< flags >*/ NM_DEVICE_CAP_IS_SOFTWARE = 0x00000004, } NMDeviceCapabilities; - /** * NMDeviceWifiCapabilities: * @NM_WIFI_DEVICE_CAP_NONE: device has no encryption/authentication capabilities @@ -229,7 +227,6 @@ typedef enum { /*< flags >*/ NM_WIFI_DEVICE_CAP_FREQ_5GHZ = 0x00000400, } NMDeviceWifiCapabilities; - /** * NM80211ApFlags: * @NM_802_11_AP_FLAGS_NONE: access point has no special capabilities @@ -343,7 +340,6 @@ typedef enum { /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_LTE = 0x00000008, } NMDeviceModemCapabilities; - /** * NMDeviceState: * @NM_DEVICE_STATE_UNKNOWN: the device's state is unknown @@ -398,7 +394,6 @@ typedef enum { NM_DEVICE_STATE_FAILED = 120, } NMDeviceState; - /** * NMDeviceStateReason: * @NM_DEVICE_STATE_REASON_NONE: No reason given @@ -535,7 +530,6 @@ typedef enum { NM_DEVICE_STATE_REASON_LAST = 0xFFFF, } NMDeviceStateReason; - /** * NMActiveConnectionState: * @NM_ACTIVE_CONNECTION_STATE_UNKNOWN: the state of the connection is unknown |