Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions libraries/SocketWrapper/SocketHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,11 @@ void NetworkInterface::setMACAddress(const uint8_t *mac) {

int NetworkInterface::begin(bool blocking, uint64_t additional_event_mask) {
dhcp();
int ret = net_mgmt_event_wait_on_iface(netif, NET_EVENT_IPV4_ADDR_ADD | additional_event_mask,
NULL, NULL, NULL, blocking ? K_FOREVER : K_SECONDS(1));
// FIXME: additional_event_mask cannot be ORed here due to how Zephyr
// events are handled internally. Must be reworked to wait on a sem
// and register multiple event masks with event_handler instead.
int ret = net_mgmt_event_wait_on_iface(netif, NET_EVENT_IPV4_ADDR_ADD, NULL, NULL, NULL,
blocking ? K_FOREVER : K_SECONDS(1));
return (ret == 0) ? 1 : 0;
}

Expand Down
Loading