From 2cf290bb7c718335142072c8c7bbac4498d4b78e Mon Sep 17 00:00:00 2001
From: wangchen <253227059@qq.com>
Date: Fri, 23 Sep 2022 07:12:01 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=B0=81=E8=A3=85=E7=9A=84ioctl=E7=AD=89?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E3=80=90=E8=83=8C=E6=99=AF=E3=80=91?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BD=91=E7=BB=9C=E6=A8=A1=E5=9D=97=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E7=9A=84ioctl=E7=AD=89=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【修改方案】
1, 删除网络模块封装的ioctl等接口

【影响】
对现有的产品编译不会有影响。
re #I5SRE6
Signed-off-by: wangchen <wangchen240@huawei.com>
---
 components/net/lwip-2.1/porting/include/lwip/lwipopts.h | 3 +++
 components/net/lwip-2.1/porting/src/sockets_porting.c   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/components/net/lwip-2.1/porting/include/lwip/lwipopts.h b/components/net/lwip-2.1/porting/include/lwip/lwipopts.h
index 1f1ac3c0..535da98f 100644
--- a/components/net/lwip-2.1/porting/include/lwip/lwipopts.h
+++ b/components/net/lwip-2.1/porting/include/lwip/lwipopts.h
@@ -240,4 +240,7 @@
 #define LWIP_SOCKET_OFFSET              CONFIG_NFILE_DESCRIPTORS
 #endif
 
+#define LWIP_SOCKET_IOCTL               0
+#define LWIP_SOCKET_FCNTL               0
+
 #endif /* _LWIP_PORTING_LWIPOPTS_H_ */
diff --git a/components/net/lwip-2.1/porting/src/sockets_porting.c b/components/net/lwip-2.1/porting/src/sockets_porting.c
index 7348e09b..7a883d91 100644
--- a/components/net/lwip-2.1/porting/src/sockets_porting.c
+++ b/components/net/lwip-2.1/porting/src/sockets_porting.c
@@ -211,6 +211,7 @@ int close(int fd)
 }
 #endif
 
+#if LWIP_SOCKET_IOCTL
 #ifdef LWIP_SOCKET_IOCTL_FUNC
 int ioctl(int fd, int req, ...)
 {
@@ -222,7 +223,9 @@ int ioctl(int fd, int req, ...)
     return lwip_ioctl(fd, (long)req, (void *)arg);
 }
 #endif
+#endif
 
+#if LWIP_SOCKET_FCNTL
 #ifdef LWIP_SOCKET_FCNTL_FUNC
 int fcntl(int fd, int cmd, ...)
 {
@@ -234,6 +237,7 @@ int fcntl(int fd, int cmd, ...)
     return lwip_fcntl(fd, cmd, val);
 }
 #endif
+#endif
 
 #if LWIP_SOCKET_SELECT
 #ifdef LWIP_SOCKET_SELECT_FUNC