diff options
| author | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
| commit | f9ceafd4a124142617280101eda5464ac67c5e39 (patch) | |
| tree | cd336e771bf30ba1ee0347037a7f47095fc04c58 /include | |
| parent | 7de13fa58dca796493b623fcba00d468f3aaa9f6 (diff) | |
| parent | 5a35862a1d24fb8d515ea09339123646370c2845 (diff) | |
| download | NetworkManager-f9ceafd4a124142617280101eda5464ac67c5e39.tar.gz | |
Merge remote branch 'origin/master' into rm-userset
Diffstat (limited to 'include')
| -rw-r--r-- | include/NetworkManager.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 95f0653536..924d044eef 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -38,6 +38,9 @@ #define NM_DBUS_INTERFACE_SERIAL_DEVICE NM_DBUS_INTERFACE_DEVICE ".Serial" #define NM_DBUS_INTERFACE_GSM_DEVICE NM_DBUS_INTERFACE_DEVICE ".Gsm" #define NM_DBUS_INTERFACE_CDMA_DEVICE NM_DBUS_INTERFACE_DEVICE ".Cdma" +#define NM_DBUS_INTERFACE_DEVICE_WIMAX NM_DBUS_INTERFACE_DEVICE ".WiMax" +#define NM_DBUS_INTERFACE_WIMAX_NSP NM_DBUS_INTERFACE ".WiMax.Nsp" +#define NM_DBUS_PATH_WIMAX_NSP NM_DBUS_PATH "/Nsp" #define NM_DBUS_INTERFACE_ACTIVE_CONNECTION NM_DBUS_INTERFACE ".Connection.Active" #define NM_DBUS_INTERFACE_IP4_CONFIG NM_DBUS_INTERFACE ".IP4Config" #define NM_DBUS_INTERFACE_DHCP4_CONFIG NM_DBUS_INTERFACE ".DHCP4Config" @@ -82,6 +85,7 @@ typedef enum NMDeviceType NM_DEVICE_TYPE_GSM, NM_DEVICE_TYPE_CDMA, NM_DEVICE_TYPE_BT, /* Bluetooth */ + NM_DEVICE_TYPE_WIMAX, NM_DEVICE_TYPE_OLPC_MESH } NMDeviceType; |