diff options
author | Thomas Haller <thaller@redhat.com> | 2022-01-29 16:21:10 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2022-01-29 16:28:37 +0100 |
commit | 068f8dc49651cd7cb82215538f27ded8e41c0463 (patch) | |
tree | f8fbf1af571d91a2b2e0d5e8a6fd0c284a512008 | |
parent | 748feaee892cb9e2a334237ee1893ab0aaea4153 (diff) | |
download | NetworkManager-068f8dc49651cd7cb82215538f27ded8e41c0463.tar.gz |
device/wwan: drop deprecated MM_MODEM_CAPABILITY_LTE_ADVANCED
This is long deprecated, and was apparently never even used/exposed
by ModemManager. Drop it.
-rw-r--r-- | src/core/devices/wwan/nm-modem-broadband.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c index a5d990cf94..c1d8b1ee0d 100644 --- a/src/core/devices/wwan/nm-modem-broadband.c +++ b/src/core/devices/wwan/nm-modem-broadband.c @@ -20,22 +20,10 @@ #define NM_MODEM_BROADBAND_MODEM "modem" -static gboolean -MODEM_CAPS_3GPP(MMModemCapability caps) -{ - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - /* MM_MODEM_CAPABILITY_LTE_ADVANCED is marked as deprecated since ModemManager 1.14.0. - * - * The flag probably was never used, it certainly isn't used since 1.14.0. - * - * Still, just to be sure, there is no harm in checking it here. Suppress the - * warning, it should have no bad effect. - */ - return NM_FLAGS_ANY(caps, - (MM_MODEM_CAPABILITY_GSM_UMTS | MM_MODEM_CAPABILITY_LTE - | MM_MODEM_CAPABILITY_LTE_ADVANCED | MM_MODEM_CAPABILITY_5GNR)); - G_GNUC_END_IGNORE_DEPRECATIONS -} +#define MODEM_CAPS_3GPP(caps) \ + NM_FLAGS_ANY( \ + caps, \ + (MM_MODEM_CAPABILITY_GSM_UMTS | MM_MODEM_CAPABILITY_LTE | MM_MODEM_CAPABILITY_5GNR)) #define MODEM_CAPS_3GPP2(caps) NM_FLAGS_ANY((caps), MM_MODEM_CAPABILITY_CDMA_EVDO) |