diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2015-11-30 22:03:43 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2015-12-01 14:05:25 +0100 |
| commit | 9ec94dbad36e851501111deb41210c56ccc62046 (patch) | |
| tree | 5e82e22a3bda33ed2cd322dfb4307f7abfac9da2 | |
| parent | ecc05730227d695aebd8dd5f2fcf229a4c6a1212 (diff) | |
| download | NetworkManager-bg/device-creation-ip-tunnel-bgo758047.tar.gz | |
libnm-glib: add support for IP tunnel devices as generic onesbg/device-creation-ip-tunnel-bgo758047
| -rw-r--r-- | libnm-glib/nm-device.c | 1 | ||||
| -rw-r--r-- | libnm-util/NetworkManager.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index aac94fb1dc..ce76432107 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -321,6 +321,7 @@ _nm_device_gtype_from_dtype (NMDeviceType dtype) return NM_TYPE_DEVICE_VLAN; case NM_DEVICE_TYPE_GENERIC: case NM_DEVICE_TYPE_TUN: + case NM_DEVICE_TYPE_IP_TUNNEL: return NM_TYPE_DEVICE_GENERIC; default: g_warning ("Unknown device type %d", dtype); diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index 71862c42eb..8101082b77 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -152,6 +152,7 @@ typedef enum { * @NM_DEVICE_TYPE_BRIDGE: a bridge master interface * @NM_DEVICE_TYPE_TEAM: a team master interface * @NM_DEVICE_TYPE_TUN: a TUN/TAP interface + * @NM_DEVICE_TYPE_IP_TUNNEL: an IP tunnel interface * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. @@ -176,6 +177,7 @@ typedef enum { NM_DEVICE_TYPE_GENERIC = 14, NM_DEVICE_TYPE_TEAM = 15, NM_DEVICE_TYPE_TUN = 16, + NM_DEVICE_TYPE_IP_TUNNEL = 17, } NMDeviceType; /** |