From 9c1a2d91ca9fb6dd26d82dba29a742301517d9ed Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Sun, 12 Nov 2023 15:16:38 -0800 Subject: [PATCH] AP_HAL: squash --- libraries/AP_HAL/utility/Socket.cpp | 2 +- libraries/AP_HAL_ChibiOS/hwdef/common/lwipopts.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_HAL/utility/Socket.cpp b/libraries/AP_HAL/utility/Socket.cpp index 487aa070de97df..1e8e6957cff6df 100644 --- a/libraries/AP_HAL/utility/Socket.cpp +++ b/libraries/AP_HAL/utility/Socket.cpp @@ -188,7 +188,7 @@ bool SocketAPM::set_cloexec() const ssize_t SocketAPM::send(const void *buf, size_t size) const { #if AP_NETWORKING_BACKEND_CHIBIOS - return send(fd, buf, size, 0); + return lwip_send(fd, buf, size, 0); #else return ::send(fd, buf, size, 0); #endif diff --git a/libraries/AP_HAL_ChibiOS/hwdef/common/lwipopts.h b/libraries/AP_HAL_ChibiOS/hwdef/common/lwipopts.h index 5b8b2aa6f55ef4..a0d68faa596d05 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/common/lwipopts.h +++ b/libraries/AP_HAL_ChibiOS/hwdef/common/lwipopts.h @@ -1445,7 +1445,7 @@ * (only used if you use sockets.c) */ #ifndef LWIP_COMPAT_SOCKETS -#define LWIP_COMPAT_SOCKETS 2 +#define LWIP_COMPAT_SOCKETS 1 #endif /**