From f31182c08d3801489510cb40cca11f82868d1989 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 23 Mar 2020 08:07:18 +0100 Subject: [PATCH] iface-modem-3gpp: don't fixup CS network support This is already done by the modem interface as soon as current capabilities are loaded. --- src/mm-iface-modem-3gpp.c | 9 --------- src/mm-iface-modem.c | 9 --------- src/mm-iface-modem.h | 1 - 3 files changed, 19 deletions(-) diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c index f3779c95..662052fb 100644 --- a/src/mm-iface-modem-3gpp.c +++ b/src/mm-iface-modem-3gpp.c @@ -2579,15 +2579,6 @@ mm_iface_modem_3gpp_initialize (MMIfaceModem3gpp *self, g_object_set (self, MM_IFACE_MODEM_3GPP_DBUS_SKELETON, skeleton, NULL); - - /* If the modem is *only* LTE, we assume that CS network is not - * supported */ - if (mm_iface_modem_is_3gpp_lte_only (MM_IFACE_MODEM (self))) { - mm_obj_dbg (self, "LTE-only device, assuming CS network is not supported"); - g_object_set (self, - MM_IFACE_MODEM_3GPP_CS_NETWORK_SUPPORTED, FALSE, - NULL); - } } ctx = g_new0 (InitializationContext, 1); diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index eaab6c17..14e64ec3 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -5589,15 +5589,6 @@ mm_iface_modem_is_3gpp_only (MMIfaceModem *self) return (capabilities & MM_MODEM_CAPABILITY_3GPP) && !((MM_MODEM_CAPABILITY_3GPP ^ capabilities) & capabilities); } -gboolean -mm_iface_modem_is_3gpp_lte_only (MMIfaceModem *self) -{ - MMModemCapability capabilities; - - capabilities = mm_iface_modem_get_current_capabilities (self); - return ((capabilities & MM_MODEM_CAPABILITY_LTE) && !((MM_MODEM_CAPABILITY_LTE ^ capabilities) & capabilities)); -} - gboolean mm_iface_modem_is_cdma_only (MMIfaceModem *self) { diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h index 13be87ad..541d6f6b 100644 --- a/src/mm-iface-modem.h +++ b/src/mm-iface-modem.h @@ -391,7 +391,6 @@ MMModemCapability mm_iface_modem_get_current_capabilities (MMIfaceModem *self); gboolean mm_iface_modem_is_3gpp (MMIfaceModem *self); gboolean mm_iface_modem_is_3gpp_only (MMIfaceModem *self); gboolean mm_iface_modem_is_3gpp_lte (MMIfaceModem *self); -gboolean mm_iface_modem_is_3gpp_lte_only (MMIfaceModem *self); gboolean mm_iface_modem_is_cdma (MMIfaceModem *self); gboolean mm_iface_modem_is_cdma_only (MMIfaceModem *self);