diff options
| author | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
| commit | 8254edbf64d60bef0d70eee01490103148dba100 (patch) | |
| tree | 282eb053995da653ee170e910da05d9530d4ff53 /libnm/nm-device.c | |
| parent | 857e5310d1764114da056cd2eb3d88625bb0ba81 (diff) | |
| parent | 90e8691111889a7b5f3c812f5a41f15a8a058913 (diff) | |
Update upstream source from tag 'upstream/1.9.90'
Update to upstream version '1.9.90' with Debian dir 83533c23245795edf9fe4919e4af3e78f2938519
Diffstat (limited to 'libnm/nm-device.c')
| -rw-r--r-- | libnm/nm-device.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 969d08a6..65afd078 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -261,6 +261,9 @@ coerce_type (NMDeviceType type) case NM_DEVICE_TYPE_WIFI: case NM_DEVICE_TYPE_BT: case NM_DEVICE_TYPE_OLPC_MESH: + case NM_DEVICE_TYPE_OVS_INTERFACE: + case NM_DEVICE_TYPE_OVS_PORT: + case NM_DEVICE_TYPE_OVS_BRIDGE: case NM_DEVICE_TYPE_WIMAX: case NM_DEVICE_TYPE_MODEM: case NM_DEVICE_TYPE_INFINIBAND: @@ -280,6 +283,7 @@ coerce_type (NMDeviceType type) case NM_DEVICE_TYPE_UNUSED2: case NM_DEVICE_TYPE_UNKNOWN: case NM_DEVICE_TYPE_DUMMY: + case NM_DEVICE_TYPE_PPP: return type; } return NM_DEVICE_TYPE_UNKNOWN; @@ -1521,6 +1525,12 @@ get_type_name (NMDevice *device) return _("Bluetooth"); case NM_DEVICE_TYPE_OLPC_MESH: return _("OLPC Mesh"); + case NM_DEVICE_TYPE_OVS_INTERFACE: + return _("OpenVSwitch Interface"); + case NM_DEVICE_TYPE_OVS_PORT: + return _("OpenVSwitch Port"); + case NM_DEVICE_TYPE_OVS_BRIDGE: + return _("OpenVSwitch Bridge"); case NM_DEVICE_TYPE_WIMAX: return _("WiMAX"); case NM_DEVICE_TYPE_MODEM: @@ -1551,6 +1561,8 @@ get_type_name (NMDevice *device) return _("MACsec"); case NM_DEVICE_TYPE_DUMMY: return _("Dummy"); + case NM_DEVICE_TYPE_PPP: + return _("PPP"); case NM_DEVICE_TYPE_GENERIC: case NM_DEVICE_TYPE_UNUSED1: case NM_DEVICE_TYPE_UNUSED2: @@ -2138,7 +2150,7 @@ out: * @callback: callback to be called when the reapply operation completes * @user_data: caller-specific data passed to @callback * - * Asynchronously begins an get the a currently applied connection. + * Asynchronously begins and gets the currently applied connection. * * Since: 1.2 **/ |