about summary refs log tree commit diff
path: root/src/libnm-client-impl/nm-device.c
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2023-02-14 10:06:06 -0500
committerJeremy Bicha <jeremy.bicha@canonical.com>2023-02-14 10:06:06 -0500
commitb3c2e57e153446d32d16f2d99e6abbb50146dddb (patch)
treee71a5353ff26c7e33cbe6e482874bedc1c3cc1cd /src/libnm-client-impl/nm-device.c
parent1d817ebf5302c204e3ce9d3512db13bf834fee33 (diff)
parented857ba34efc2ec899f2e3fbd8e35324561a55b2 (diff)
Merge tag 'debian/1.42.0-1' into ubuntu/master
network-manager Debian release 1.42.0-1
Diffstat (limited to 'src/libnm-client-impl/nm-device.c')
-rw-r--r--src/libnm-client-impl/nm-device.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c
index 0e971d39..d5ecee48 100644
--- a/src/libnm-client-impl/nm-device.c
+++ b/src/libnm-client-impl/nm-device.c
@@ -312,6 +312,7 @@ coerce_type(NMDeviceType type)
     case NM_DEVICE_TYPE_WIREGUARD:
     case NM_DEVICE_TYPE_WIFI_P2P:
     case NM_DEVICE_TYPE_VRF:
+    case NM_DEVICE_TYPE_LOOPBACK:
         return type;
     }
     return NM_DEVICE_TYPE_UNKNOWN;
@@ -1811,6 +1812,8 @@ get_type_name(NMDevice *device)
         return _("Wi-Fi P2P");
     case NM_DEVICE_TYPE_VRF:
         return _("VRF");
+    case NM_DEVICE_TYPE_LOOPBACK:
+        return _("Loopback");
     case NM_DEVICE_TYPE_GENERIC:
     case NM_DEVICE_TYPE_UNUSED1:
     case NM_DEVICE_TYPE_UNUSED2:
@@ -2979,7 +2982,8 @@ NM_IS_LLDP_NEIGHBOR(const NMLldpNeighbor *self)
  * Note that #NMLldpNeighbor has no public API for mutating
  * an instance. Also, libnm will not internally mutate a
  * once exposed object. They are guaranteed to be immutable.
- * Since 1.32, ref-counting is thread-safe.
+ *
+ * Since 1.32, ref-counting of #NMLldpNeighbor is thread-safe.
  *
  * This function is not useful, as there is no public API to
  * actually modify the (empty) instance.