From 818f7f57243feb31ac9089d1f787e70ff9dc63a6 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Mon, 30 Nov 2015 22:03:43 +0100
Subject: [PATCH] libnm-glib: add support for IP tunnel devices as generic ones

---
 libnm-glib/nm-device.c      | 1 +
 libnm-util/NetworkManager.h | 2 ++
 2 files changed, 3 insertions(+)

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;
 
 /**