From 977aba6d02c87f884ecc79672690befcbcfd0186 Mon Sep 17 00:00:00 2001 From: Lukasz Maciejonczyk Date: Mon, 10 May 2021 10:24:50 +0200 Subject: [PATCH] net: openthread: Fix multiple Kconfig enablers for Link Metrics Remove duplicated enabler for Link Metrics feature. Signed-off-by: Lukasz Maciejonczyk --- subsys/net/l2/openthread/Kconfig.features | 2 +- .../platform/openthread-core-zephyr-config.h | 11 ----------- subsys/net/lib/openthread/platform/radio.c | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/subsys/net/l2/openthread/Kconfig.features b/subsys/net/l2/openthread/Kconfig.features index 0e7676a26a8740..a8549ce2f9edcd 100644 --- a/subsys/net/l2/openthread/Kconfig.features +++ b/subsys/net/l2/openthread/Kconfig.features @@ -183,7 +183,7 @@ config OPENTHREAD_OTNS config OPENTHREAD_FULL_LOGS bool "Enable OpenThread full logs" -config OPENTHREAD_MLE_LINK_METRICS_ENABLE +config OPENTHREAD_LINK_METRICS bool "Enable Link Metrics support" config OPENTHREAD_SRP_CLIENT diff --git a/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h b/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h index a685e9aed8738a..343ad3f0b3c168 100644 --- a/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h +++ b/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h @@ -291,15 +291,4 @@ CONFIG_OPENTHREAD_CSL_RECEIVE_TIME_AHEAD #endif /* CONFIG_OPENTHREAD_CSL_RECEIVE_TIME_AHEAD */ -/** - * @def OPENTHREAD_CONFIG_MLE_LINK_METRICS_ENABLE - * - * Set to 1 to enable Link Metrics feature. - * - */ -#ifdef CONFIG_OPENTHREAD_MLE_LINK_METRICS_ENABLE -#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_ENABLE \ - CONFIG_OPENTHREAD_MLE_LINK_METRICS_ENABLE -#endif /* CONFIG_OPENTHREAD_MLE_LINK_METRICS_ENABLE */ - #endif /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */ diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c index 77d2a8d0613e73..eb9a12b78a7bd8 100644 --- a/subsys/net/lib/openthread/platform/radio.c +++ b/subsys/net/lib/openthread/platform/radio.c @@ -1018,7 +1018,7 @@ uint8_t otPlatRadioGetCslAccuracy(otInstance *aInstance) return radio_api->get_csl_acc(radio_dev); } -#if defined(CONFIG_OPENTHREAD_MLE_LINK_METRICS_ENABLE) +#if defined(CONFIG_OPENTHREAD_LINK_METRICS) otError otPlatRadioConfigureEnhAckProbing(otInstance *aInstance, otLinkMetrics aLinkMetrics, const otShortAddress aShortAddress, const otExtAddress *aExtAddress)