From eb9a1843248c35ebda66d8857264f92000eefcc9 Mon Sep 17 00:00:00 2001
From: Vincent Wan <vwan@ti.com>
Date: Fri, 14 Aug 2020 17:26:33 -0700
Subject: [PATCH] drivers: fix socket close() implementations for socket
 offloading

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>
---
 drivers/modem/ublox-sara-r4.c                | 8 ++------
 drivers/wifi/eswifi/eswifi_socket_offload.c  | 8 ++------
 drivers/wifi/simplelink/simplelink_sockets.c | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c
index 30e23e5c2a3..828b3b3dbfb 100644
--- a/drivers/modem/ublox-sara-r4.c
+++ b/drivers/modem/ublox-sara-r4.c
@@ -1205,8 +1205,9 @@ static int offload_socket(int family, int type, int proto)
 	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")];
 	int ret;
 
@@ -1453,11 +1454,6 @@ static ssize_t offload_sendto(void *obj, const void *buf, size_t len,
 	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)
 {
 	switch (request) {
diff --git a/drivers/wifi/eswifi/eswifi_socket_offload.c b/drivers/wifi/eswifi/eswifi_socket_offload.c
index ffb59f5e6ce..ab677c13919 100644
--- a/drivers/wifi/eswifi/eswifi_socket_offload.c
+++ b/drivers/wifi/eswifi/eswifi_socket_offload.c
@@ -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);
 }
 
-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 net_pkt *pkt;
 	int ret;
@@ -499,11 +500,6 @@ static int eswifi_socket_create(int family, int type, int proto)
 	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)
 {
 	int sd = OBJ_TO_SD(obj);
diff --git a/drivers/wifi/simplelink/simplelink_sockets.c b/drivers/wifi/simplelink/simplelink_sockets.c
index cc3ee708df0..d0a8497ea47 100644
--- a/drivers/wifi/simplelink/simplelink_sockets.c
+++ b/drivers/wifi/simplelink/simplelink_sockets.c
@@ -281,8 +281,9 @@ exit:
 	return retval;
 }
 
-static int simplelink_close(int sd)
+static int simplelink_close(void *obj)
 {
+	int sd = OBJ_TO_SD(obj);
 	int retval;
 
 	retval = sl_Close(sd);
@@ -1124,11 +1125,6 @@ exit:
 	return retval;
 }
 
-static int simplelink_close(void *obj)
-{
-	return simplelink_close(sd);
-}
-
 static int simplelink_ioctl(void *obj, unsigned int request, va_list args)
 {
 	int sd = OBJ_TO_SD(obj);