fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 18:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

modem: suppress deprecated warning from libmm for MM_MODEM_CAPABILITY_LTE_ADVANCED

Browse source 
On Ubuntu 20.10, we build against ModemManager 1.14.0 and get a compiler warning:

  ../src/devices/wwan/nm-modem-broadband.c: In function 'try_create_connect_properties':
  ../src/devices/wwan/nm-modem-broadband.c:492:2: error: 'MMModemCapabilityDeprecated' is deprecated [-Werror=deprecated-declarations]
    492 |  if (MODEM_CAPS_3GPP (ctx->caps)) {
        |  ^~

Suppress it.

An alternative would be to drop the flag entirely. It seems the flag
was never used (and never will be used). But if that's true, there is
little harm done checking it. If it's not true, we better keep checking
for older versions.

0cd76bf1c4
This commit is contained in:
Thomas Haller 2020-06-30 17:34:05 +02:00
parent 3d542b55ed
commit 03dc759026
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/devices/wwan/nm-modem-broadband.c
View file

@ -20,9 +20,22 @@
#define NM_MODEM_BROADBAND_MODEM "modem"
#define MODEM_CAPS_3GPP(caps) (caps & (MM_MODEM_CAPABILITY_GSM_UMTS | \
MM_MODEM_CAPABILITY_LTE | \
MM_MODEM_CAPABILITY_LTE_ADVANCED))
static gboolean
MODEM_CAPS_3GPP (MMModemCapability caps)
{
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* MM_MODEM_CAPABILITY_LTE_ADVANCED is marked as deprecated since ModemManager 1.14.0.
*
* The flag probably was never used, it certainly isn't used since 1.14.0.
*
* Still, just to be sure, there is no harm in checking it here. Suppress the
* warning, it should have no bad effect.
*/
return NM_FLAGS_ANY (caps, ( MM_MODEM_CAPABILITY_GSM_UMTS
| MM_MODEM_CAPABILITY_LTE
| MM_MODEM_CAPABILITY_LTE_ADVANCED));
G_GNUC_END_IGNORE_DEPRECATIONS
}
#define MODEM_CAPS_3GPP2(caps) (caps & (MM_MODEM_CAPABILITY_CDMA_EVDO))