diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
| commit | 1f85f9683a41ca116af20fd19940576040303080 (patch) | |
| tree | 54c4ac337fe0b0091772b7ef6a22c715dd985fab /libnm/nm-device.c | |
| parent | eca0cfe89a2a7ec88abe9c03075160f46b338137 (diff) | |
| parent | 5554398639fa9e344bd12205a64874e6436b936e (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'libnm/nm-device.c')
| -rw-r--r-- | libnm/nm-device.c | 11 |
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: |