From 8a15a2b47e24b89f9062a739a38453d987e3ce13 Mon Sep 17 00:00:00 2001 From: Fabian Frei Date: Wed, 1 Nov 2023 11:14:14 +0100 Subject: [PATCH] [sg temphack] net: lwm2m: Always send LwM2M object version Wakaama as of 2024-03-27 always needs to get an object version. Upstream: https://github.com/eclipse/wakaama/issues/487#issuecomment-721775939 (cherry picked from commit 8f701bbcf74bfebf09291ac67e734bd3a1830940) --- subsys/net/lib/lwm2m/lwm2m_registry.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/subsys/net/lib/lwm2m/lwm2m_registry.c b/subsys/net/lib/lwm2m/lwm2m_registry.c index 636319f9d934..7df76d60cc62 100644 --- a/subsys/net/lib/lwm2m/lwm2m_registry.c +++ b/subsys/net/lib/lwm2m/lwm2m_registry.c @@ -2080,21 +2080,9 @@ struct lwm2m_engine_res_inst *lwm2m_engine_get_res_inst(const struct lwm2m_obj_p bool lwm2m_engine_shall_report_obj_version(const struct lwm2m_engine_obj *obj) { - /* For non-core objects, report version other than 1.0 */ - if (!obj->is_core) { - return obj->version_major != 1 || obj->version_minor != 0; - } - - /* For core objects, report version based on default version array. */ - for (size_t i = 0; i < ARRAY_SIZE(default_obj_versions); i++) { - if (obj->obj_id != default_obj_versions[i].obj_id) { - continue; - } - - return obj->version_major != default_obj_versions[i].version_major || - obj->version_minor != default_obj_versions[i].version_minor; - } + (void)default_obj_versions; + // HACK: Always send ipso object version as a workaround return true; }