SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge request !1327 from 'nas-service-domain-deprecated'

Browse Source 
modem-helpers-qmi: fix deprecated usage of QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN

https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1327
This commit is contained in:
Dan Williams
2025-04-09 01:51:39 +00:00
parent 3a2a7897d1 2246e9c0a0
commit bd9b98e2f1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-qmi.c
+1 -1
View File
@@ -5417,7 +5417,7 @@ network_reject_indication_cb (QmiClientNas *client,
QmiIndicationNasNetworkRejectOutput *output,
MMBroadbandModemQmi *self)
{
QmiNasNetworkServiceDomain service_domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN;
QmiNasNetworkServiceDomain service_domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_NONE;
QmiNasRadioInterface radio_interface = QMI_NAS_RADIO_INTERFACE_UNKNOWN;
QmiNasRejectCause reject_cause = QMI_NAS_REJECT_CAUSE_NONE;
guint16 mcc = 0;
src/mm-modem-helpers-qmi.c
+5 -5
View File
@@ -1580,7 +1580,7 @@ process_common_info (const gchar *info_name,
/* On a successful registration (either home or roaming) we require a valid
* domain and "available" service status */
else if (domain_valid &&
domain != QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN &&
domain != QMI_NAS_NETWORK_SERVICE_DOMAIN_CAMPED &&
domain != QMI_NAS_NETWORK_SERVICE_DOMAIN_NONE &&
service_status == QMI_NAS_SERVICE_STATUS_AVAILABLE) {
MMModem3gppRegistrationState tmp_registration_state;
@@ -1641,7 +1641,7 @@ process_gsm_info (QmiMessageNasGetSystemInfoOutput *response_output,
{
QmiNasServiceStatus service_status = QMI_NAS_SERVICE_STATUS_NONE;
gboolean domain_valid = FALSE;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_NONE;
gboolean roaming_status_valid = FALSE;
QmiNasRoamingStatus roaming_status = QMI_NAS_ROAMING_STATUS_OFF;
gboolean forbidden_valid = FALSE;
@@ -1733,7 +1733,7 @@ process_wcdma_info (QmiMessageNasGetSystemInfoOutput *response_output,
{
QmiNasServiceStatus service_status = QMI_NAS_SERVICE_STATUS_NONE;
gboolean domain_valid = FALSE;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_NONE;
gboolean roaming_status_valid = FALSE;
QmiNasRoamingStatus roaming_status = QMI_NAS_ROAMING_STATUS_OFF;
gboolean forbidden_valid = FALSE;
@@ -1827,7 +1827,7 @@ process_lte_info (QmiMessageNasGetSystemInfoOutput *response_output,
{
QmiNasServiceStatus service_status = QMI_NAS_SERVICE_STATUS_NONE;
gboolean domain_valid = FALSE;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_NONE;
gboolean roaming_status_valid = FALSE;
QmiNasRoamingStatus roaming_status = QMI_NAS_ROAMING_STATUS_OFF;
gboolean forbidden_valid = FALSE;
@@ -1926,7 +1926,7 @@ process_nr5g_info (QmiMessageNasGetSystemInfoOutput *response_output,
{
QmiNasServiceStatus service_status = QMI_NAS_SERVICE_STATUS_NONE;
gboolean domain_valid = FALSE;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN;
QmiNasNetworkServiceDomain domain = QMI_NAS_NETWORK_SERVICE_DOMAIN_NONE;
gboolean roaming_status_valid = FALSE;
QmiNasRoamingStatus roaming_status = QMI_NAS_ROAMING_STATUS_OFF;
gboolean forbidden_valid = FALSE;