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

Merge request !1401 from 'dp/fix-mux-bearer-cleanup-assert'

Browse Source 
base-manager: fix cleanup of multiplexed bearers

https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1401
This commit is contained in:
Dan Williams
2025-10-03 12:43:23 -05:00
parent 8d911cdd1a 0edcb916ad
commit 72dca00e69
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-iface-modem.c
+6 -3
View File
@@ -6834,10 +6834,13 @@ mm_iface_modem_count_bearers (MMIfaceModem *self,
return FALSE; return FALSE;
} }
if (flags & MM_IFACE_MODEM_COUNT_BEARERS_FLAG_MULTIPLEXED) /* If only MULTIPLEXED is requested, only return max multiplexed bearers */
max = mm_bearer_list_get_max_active_multiplexed (list); if (flags & ~MM_IFACE_MODEM_COUNT_BEARERS_FLAG_MULTIPLEXED)
else
max = mm_bearer_list_get_max_active (list); max = mm_bearer_list_get_max_active (list);
/* multiplexed is a subset of ACTIVE/CONNECTED */
if (flags & (MM_IFACE_MODEM_COUNT_BEARERS_FLAG_ACTIVE | MM_IFACE_MODEM_COUNT_BEARERS_FLAG_CONNECTED |
MM_IFACE_MODEM_COUNT_BEARERS_FLAG_MULTIPLEXED))
max += mm_bearer_list_get_max_active_multiplexed (list);
mm_bearer_list_foreach (list, (MMBearerListForeachFunc)bearer_count, &ctx); mm_bearer_list_foreach (list, (MMBearerListForeachFunc)bearer_count, &ctx);
g_assert (max >= ctx.count); g_assert (max >= ctx.count);