Skip to content

Commit 4b55480

Browse files
authored
Merge pull request #21833 from mguetschow/lwip-netdev-type-fix
pkg/lwip/netdev: fix return types in send()
2 parents 03862d1 + a045acb commit 4b55480

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

pkg/lwip/contrib/netdev/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
MODULE := lwip_netdev
22

3+
USEMODULE += tiny_strerror
4+
35
include $(RIOTBASE)/Makefile.base

pkg/lwip/contrib/netdev/lwip_netdev.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "netif/lowpan6.h"
3838
#include "thread.h"
3939
#include "thread_flags.h"
40+
#include "tiny_strerror.h"
4041
#include "utlist.h"
4142

4243
#define ENABLE_DEBUG 0
@@ -275,11 +276,11 @@ static err_t _common_link_output(struct netif *netif, netdev_t *netdev, iolist_t
275276
{
276277
lwip_netif_dev_acquire(netif);
277278

278-
err_t res;
279+
int res;
279280
if (is_netdev_legacy_api(netdev)) {
280-
res = (netdev->driver->send(netdev, iolist) > 0) ? ERR_OK : ERR_BUF;
281+
res = netdev->driver->send(netdev, iolist);
281282
lwip_netif_dev_release(netif);
282-
return res;
283+
return res > 0 ? ERR_OK : ERR_BUF;
283284
}
284285

285286
unsigned irq_state;
@@ -295,6 +296,7 @@ static err_t _common_link_output(struct netif *netif, netdev_t *netdev, iolist_t
295296
irq_state = irq_disable();
296297
compat_netif->thread_doing_tx = NULL;
297298
irq_restore(irq_state);
299+
DEBUG("[lwip_netdev] send() returned %s\n", tiny_strerror(res));
298300
return ERR_IF;
299301
}
300302

@@ -320,6 +322,7 @@ static err_t _common_link_output(struct netif *netif, netdev_t *netdev, iolist_t
320322
lwip_netif_dev_release(netif);
321323

322324
if (res < 0) {
325+
DEBUG("[lwip_netdev] confirm_send() returned %s\n", tiny_strerror(res));
323326
return ERR_IF;
324327
}
325328

@@ -329,9 +332,9 @@ static err_t _common_link_output(struct netif *netif, netdev_t *netdev, iolist_t
329332
static err_t _common_link_output(struct netif *netif, netdev_t *netdev, iolist_t *iolist)
330333
{
331334
lwip_netif_dev_acquire(netif);
332-
err_t res = (netdev->driver->send(netdev, iolist) > 0) ? ERR_OK : ERR_BUF;
335+
int res = netdev->driver->send(netdev, iolist);
333336
lwip_netif_dev_release(netif);
334-
return res;
337+
return res > 0 ? ERR_OK : ERR_BUF;
335338
}
336339
#endif
337340

0 commit comments

Comments
 (0)