summary refs log tree commit diff
path: root/libnm/nm-device.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-10-20 01:30:31 +0200
committerMichael Biebl <biebl@debian.org>2018-10-20 01:30:31 +0200
commit6518e361171f64bcaaa4bf868139362ed95cc2e0 (patch)
treed2d5b53faf80646a40ec2c0c7f2a42b3959612f5 /libnm/nm-device.c
parente126f3e804c35480c4f075777430419d6ece23da (diff)
New upstream version 1.14.2 upstream/1.14.2
Diffstat (limited to 'libnm/nm-device.c')
-rw-r--r--libnm/nm-device.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index d841ca37..aa45c4ad 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright 2007 - 2008 Novell, Inc.
- * Copyright 2007 - 2012 Red Hat, Inc.
+ * Copyright 2007 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -284,6 +284,9 @@ coerce_type (NMDeviceType type)
 	case NM_DEVICE_TYPE_UNKNOWN:
 	case NM_DEVICE_TYPE_DUMMY:
 	case NM_DEVICE_TYPE_PPP:
+	case NM_DEVICE_TYPE_WPAN:
+	case NM_DEVICE_TYPE_6LOWPAN:
+	case NM_DEVICE_TYPE_WIREGUARD:
 		return type;
 	}
 	return NM_DEVICE_TYPE_UNKNOWN;
@@ -1345,6 +1348,12 @@ get_type_name (NMDevice *device)
 		return _("Dummy");
 	case NM_DEVICE_TYPE_PPP:
 		return _("PPP");
+	case NM_DEVICE_TYPE_WPAN:
+		return _("IEEE 802.15.4");
+	case NM_DEVICE_TYPE_6LOWPAN:
+		return _("6LoWPAN");
+	case NM_DEVICE_TYPE_WIREGUARD:
+		return _("WireGuard");
 	case NM_DEVICE_TYPE_GENERIC:
 	case NM_DEVICE_TYPE_UNUSED1:
 	case NM_DEVICE_TYPE_UNUSED2: