diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
| commit | c2de0d98ba39e0a1a970d066fd19be786092f376 (patch) | |
| tree | 3838363c06a6019db6cf1f882ea34ebded63c38b /libnm-glib/nm-device.c | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Imported Upstream version 1.1.91 upstream/1.1.91
Diffstat (limited to 'libnm-glib/nm-device.c')
| -rw-r--r-- | libnm-glib/nm-device.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index b1f8cfb2..312f9700 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -19,13 +19,11 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> - #include <gudev/gudev.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-device-ethernet.h" #include "nm-device-adsl.h" @@ -298,6 +296,7 @@ static GType _nm_device_gtype_from_dtype (NMDeviceType dtype) { switch (dtype) { + case NM_DEVICE_TYPE_VETH: case NM_DEVICE_TYPE_ETHERNET: return NM_TYPE_DEVICE_ETHERNET; case NM_DEVICE_TYPE_WIFI: @@ -1870,9 +1869,23 @@ get_type_name (NMDevice *device) return _("VLAN"); case NM_DEVICE_TYPE_ADSL: return _("ADSL"); - default: - return _("Unknown"); + case NM_DEVICE_TYPE_MACVLAN: + return _("MACVLAN"); + case NM_DEVICE_TYPE_VXLAN: + return _("VXLAN"); + case NM_DEVICE_TYPE_IP_TUNNEL: + return _("IPTunnel"); + case NM_DEVICE_TYPE_TUN: + return _("Tun"); + case NM_DEVICE_TYPE_VETH: + return _("Veth"); + case NM_DEVICE_TYPE_GENERIC: + case NM_DEVICE_TYPE_UNUSED1: + case NM_DEVICE_TYPE_UNUSED2: + case NM_DEVICE_TYPE_UNKNOWN: + break; } + return _("Unknown"); } static char * |