diff options
| author | Aleksander Morgado <aleksandermj@chromium.org> | 2023-04-19 11:30:54 +0000 |
|---|---|---|
| committer | Aleksander Morgado <aleksandermj@chromium.org> | 2023-04-19 11:32:01 +0000 |
| commit | 1a133dca5e91f886d97162a74e3224768172be35 (patch) | |
| tree | adc6d10370119e092b31a5b3ee8131139780e1b1 | |
| parent | 552359b57e6b9edff76a9af8c44c849f840a472a (diff) | |
| download | ModemManager-1a133dca5e91f886d97162a74e3224768172be35.tar.gz | |
helpers-mbim: fix MMSignal selection based on data class
MbimDataClass is a flags bitmask, not an enumeration.
This logic was broken if the reported data class was e.g. 4G+5GNSA.
| -rw-r--r-- | src/mm-modem-helpers-mbim.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/mm-modem-helpers-mbim.c b/src/mm-modem-helpers-mbim.c index 2c19f7bd8..7701c918e 100644 --- a/src/mm-modem-helpers-mbim.c +++ b/src/mm-modem-helpers-mbim.c @@ -1100,32 +1100,27 @@ 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; - } + return NULL; } gboolean |