diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-01-13 15:22:36 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-01-13 15:22:36 -0500 |
| commit | 232b13fc50aa7350766da07d057eb397f12fbf71 (patch) | |
| tree | cd5a435c17f32b7347398363ab12188208d88c2f /src/libnm-client-impl | |
| parent | 4baddbd2cc3e3d92b45b574ab18aa2630c812e6a (diff) | |
| parent | ac445e26cbdad011277f8822e0fc468ab1a6c61f (diff) | |
Merge tag 'debian/1.40.10-1' into ubuntu/master
network-manager Debian release 1.40.10-1
Diffstat (limited to 'src/libnm-client-impl')
| -rw-r--r-- | src/libnm-client-impl/nm-device-modem.c | 10 | ||||
| -rw-r--r-- | src/libnm-client-impl/nm-device.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/libnm-client-impl/nm-device-modem.c b/src/libnm-client-impl/nm-device-modem.c index a1edfb04..4cf6a9bd 100644 --- a/src/libnm-client-impl/nm-device-modem.c +++ b/src/libnm-client-impl/nm-device-modem.c @@ -145,12 +145,14 @@ get_type_description(NMDevice *device) NMDeviceModemCapabilities caps; caps = nm_device_modem_get_current_capabilities(NM_DEVICE_MODEM(device)); - if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) + if (NM_FLAGS_ANY(caps, + NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS | NM_DEVICE_MODEM_CAPABILITY_LTE + | NM_DEVICE_MODEM_CAPABILITY_5GNR)) return "gsm"; - else if (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) + if (NM_FLAGS_HAS(caps, NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) return "cdma"; - else - return NULL; + + return "modem"; } #define MODEM_CAPS_3GPP(caps) \ diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c index 238e7c17..0e971d39 100644 --- a/src/libnm-client-impl/nm-device.c +++ b/src/libnm-client-impl/nm-device.c @@ -2496,7 +2496,7 @@ nm_device_reapply_finish(NMDevice *device, GAsyncResult *result, GError **error) /** * nm_device_get_applied_connection: * @device: a #NMDevice - * @flags: the flags argument. Currently, this value must always be zero. + * @flags: the flags argument. See #NMDeviceReapplyFlags. * @version_id: (out) (allow-none): returns the current version id of * the applied connection * @cancellable: a #GCancellable, or %NULL @@ -2559,7 +2559,7 @@ nm_device_get_applied_connection(NMDevice *device, /** * nm_device_get_applied_connection_async: * @device: a #NMDevice - * @flags: the flags argument. Currently, this value must always be zero. + * @flags: the flags argument. See #NMDeviceReapplyFlags. * @cancellable: a #GCancellable, or %NULL * @callback: callback to be called when the reapply operation completes * @user_data: caller-specific data passed to @callback |