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

helpers-mbim: fix MMSignal selection based on data class

Browse Source 
MbimDataClass is a flags bitmask, not an enumeration.

This logic was broken if the reported data class was e.g. 4G+5GNSA.
This commit is contained in:
Aleksander Morgado
2023-04-19 11:30:54 +00:00
parent 552359b57e
commit 1a133dca5e
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mm-modem-helpers-mbim.c
View File

@@ -1100,33 +1100,28 @@ select_mbim_signal_with_data_class (MbimDataClass data_class,
MMSignal **lte,
MMSignal **nr5g)
{
switch (data_class) {
case MBIM_DATA_CLASS_5G_NSA:
case MBIM_DATA_CLASS_5G_SA:
if (data_class & (MBIM_DATA_CLASS_5G_NSA |
MBIM_DATA_CLASS_5G_SA))
return nr5g;
case MBIM_DATA_CLASS_LTE:
if (data_class & (MBIM_DATA_CLASS_LTE))
return lte;
case MBIM_DATA_CLASS_UMTS:
case MBIM_DATA_CLASS_HSDPA:
case MBIM_DATA_CLASS_HSUPA:
if (data_class & (MBIM_DATA_CLASS_UMTS |
MBIM_DATA_CLASS_HSDPA |
MBIM_DATA_CLASS_HSUPA))
return umts;
case MBIM_DATA_CLASS_GPRS:
case MBIM_DATA_CLASS_EDGE:
if (data_class & (MBIM_DATA_CLASS_GPRS |
MBIM_DATA_CLASS_EDGE))
return gsm;
case MBIM_DATA_CLASS_1XEVDO:
case MBIM_DATA_CLASS_1XEVDO_REVA:
case MBIM_DATA_CLASS_1XEVDV:
case MBIM_DATA_CLASS_3XRTT:
case MBIM_DATA_CLASS_1XEVDO_REVB:
if (data_class & (MBIM_DATA_CLASS_1XEVDO |
MBIM_DATA_CLASS_1XEVDO_REVA |
MBIM_DATA_CLASS_1XEVDV |
MBIM_DATA_CLASS_3XRTT |
MBIM_DATA_CLASS_1XEVDO_REVB))
return evdo;
case MBIM_DATA_CLASS_1XRTT:
if (data_class & MBIM_DATA_CLASS_1XRTT)
return cdma;
case MBIM_DATA_CLASS_UMB:
case MBIM_DATA_CLASS_CUSTOM:
default:
return NULL;
}
}
gboolean
mm_signal_from_mbim_signal_state (MbimDataClass data_class,