michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: fix socket close() implementations for socket offloading

Browse source 
PR #27485 introduced new implementations for close() that do not build
correctly. This commit fixes the problem by re-implementing them.

Fixes #27587

Signed-off-by: Vincent Wan <vwan@ti.com>
This commit is contained in:
Vincent Wan 2020-08-14 17:26:33 -07:00 • committed by Jukka Rissanen
commit eb9a184324
3 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/modem/ublox-sara-r4.c
View file

@ -1205,8 +1205,9 @@ static int offload_socket(int family, int type, int proto)
return ret; return ret;
} }
static int offload_close(struct modem_socket *sock) static int offload_close(void *obj)
{ {
struct modem_socket *sock = (struct modem_socket *)obj;
char buf[sizeof("AT+USOCL=#\r")]; char buf[sizeof("AT+USOCL=#\r")];
int ret; int ret;
@ -1453,11 +1454,6 @@ static ssize_t offload_sendto(void *obj, const void *buf, size_t len,
return ret; return ret;
} }
static int offload_close(void *obj)
{
return offload_close((struct modem_socket *)obj);
}
static int offload_ioctl(void *obj, unsigned int request, va_list args) static int offload_ioctl(void *obj, unsigned int request, va_list args)
{ {
switch (request) { switch (request) {

8
drivers/wifi/eswifi/eswifi_socket_offload.c
View file

@ -350,8 +350,9 @@ static ssize_t eswifi_socket_recvfrom(void *obj, void *buf, size_t len,
return eswifi_socket_recv(obj, buf, len, flags); return eswifi_socket_recv(obj, buf, len, flags);
} }
static int eswifi_socket_close(int sock) static int eswifi_socket_close(void *obj)
{ {
int sock = OBJ_TO_SD(obj);
struct eswifi_off_socket *socket; struct eswifi_off_socket *socket;
struct net_pkt *pkt; struct net_pkt *pkt;
int ret; int ret;
@ -499,11 +500,6 @@ static int eswifi_socket_create(int family, int type, int proto)
return fd; return fd;
} }
static int eswifi_socket_close(void *obj)
{
return eswifi_socket_close(sd);
}
static int eswifi_socket_ioctl(void *obj, unsigned int request, va_list args) static int eswifi_socket_ioctl(void *obj, unsigned int request, va_list args)
{ {
int sd = OBJ_TO_SD(obj); int sd = OBJ_TO_SD(obj);

8
drivers/wifi/simplelink/simplelink_sockets.c
View file

@ -281,8 +281,9 @@ exit:
return retval; return retval;
} }
static int simplelink_close(int sd) static int simplelink_close(void *obj)
{ {
int sd = OBJ_TO_SD(obj);
int retval; int retval;
retval = sl_Close(sd); retval = sl_Close(sd);
@ -1124,11 +1125,6 @@ exit:
return retval; return retval;
} }
static int simplelink_close(void *obj)
{
return simplelink_close(sd);
}
static int simplelink_ioctl(void *obj, unsigned int request, va_list args) static int simplelink_ioctl(void *obj, unsigned int request, va_list args)
{ {
int sd = OBJ_TO_SD(obj); int sd = OBJ_TO_SD(obj);