Skip to content

[nrf fromlist] net: openthread: Fix ignored return values in OT utils #2738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2025
Merged

[nrf fromlist] net: openthread: Fix ignored return values in OT utils #2738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f9eed1
[nrf fromlist] net: openthread: Fix ignored return values in OT utils
rlubos Apr 9, 2025
5fe0b46
[nrf fromlist] net: openthread: Remove unused function from radio.c
rlubos Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions modules/openthread/platform/radio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,6 @@ static void reset_pending_event(enum pending_events event)
atomic_clear_bit(pending_events, event);
}

static inline void clear_pending_events(void)
{
atomic_clear(pending_events);
}

void energy_detected(const struct device *dev, int16_t max_ed)
{
if (dev == radio_dev) {
Expand Down
27 changes: 15 additions & 12 deletions subsys/net/l2/openthread/openthread_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ LOG_MODULE_DECLARE(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
#include <openthread/ip6.h>
#include <openthread/thread.h>

#include "net_private.h"
#include "openthread_utils.h"

#define ALOC16_MASK 0xfc
Expand Down Expand Up @@ -167,6 +168,7 @@ void add_ipv6_addr_to_ot(struct openthread_context *context,
struct otNetifAddress addr = { 0 };
struct net_if_ipv6 *ipv6;
struct net_if_addr *if_addr = NULL;
otError error;
int i;

/* IPv6 struct should've already been allocated when we get an
Expand Down Expand Up @@ -214,33 +216,34 @@ void add_ipv6_addr_to_ot(struct openthread_context *context,
}

openthread_api_mutex_lock(context);
otIp6AddUnicastAddress(context->instance, &addr);
error = otIp6AddUnicastAddress(context->instance, &addr);
openthread_api_mutex_unlock(context);

if (CONFIG_OPENTHREAD_L2_LOG_LEVEL == LOG_LEVEL_DBG) {
char buf[NET_IPV6_ADDR_LEN];

NET_DBG("Added %s",
net_addr_ntop(AF_INET6, &addr.mAddress, buf, sizeof(buf)));
if (error != OT_ERROR_NONE) {
NET_ERR("Failed to add IPv6 unicast address %s [%d]",
net_sprint_ipv6_addr(addr6), error);
} else {
NET_DBG("Added %s", net_sprint_ipv6_addr(addr6));
}
}

void add_ipv6_maddr_to_ot(struct openthread_context *context,
const struct in6_addr *addr6)
{
struct otIp6Address addr;
otError error;

memcpy(&addr, addr6, sizeof(addr));

openthread_api_mutex_lock(context);
otIp6SubscribeMulticastAddress(context->instance, &addr);
error = otIp6SubscribeMulticastAddress(context->instance, &addr);
openthread_api_mutex_unlock(context);

if (CONFIG_OPENTHREAD_L2_LOG_LEVEL == LOG_LEVEL_DBG) {
char buf[NET_IPV6_ADDR_LEN];

NET_DBG("Added multicast %s",
net_addr_ntop(AF_INET6, &addr, buf, sizeof(buf)));
if (error != OT_ERROR_NONE) {
NET_ERR("Failed to add IPv6 multicast address %s [%d]",
net_sprint_ipv6_addr(addr6), error);
} else {
NET_DBG("Added %s", net_sprint_ipv6_addr(addr6));
}
}

Expand Down
Loading