diff options
| author | Michael Biebl <biebl@debian.org> | 2023-01-26 21:57:17 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-01-26 21:57:17 +0100 |
| commit | f8b5aa96b4370d88f38699433cec6e7a26a410f1 (patch) | |
| tree | 1817c96b86eac7fb93125a52d6b6d31f6a4bad45 /src/libnm-client-impl/nm-device-modem.c | |
| parent | b0529444cb9c40efb19c7b4d4fe8da86ebcc7bdb (diff) | |
| parent | 2c1b7a7ea3c332b4d690c0595ef76c81de1f0cc8 (diff) | |
Merge tag 'debian/1.40.12-1' into debian/bullseye-backports
network-manager Debian release 1.40.12-1
Diffstat (limited to 'src/libnm-client-impl/nm-device-modem.c')
| -rw-r--r-- | src/libnm-client-impl/nm-device-modem.c | 10 |
1 files changed, 6 insertions, 4 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) \ |