summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-11-21 06:33:20 +0800
committerGitHub <[email protected]>2019-11-21 06:33:20 +0800
commit5a40f932c9dc20a63a24c6a1f29828f4bfd35c04 (patch)
treeea301c6dccb2ee1af28eabc6973a64e176b13434 /components
parent1bf5f67e8a6c9672945d3b0a61e173ce0b6e56d3 (diff)
parentc531fdc7aeb0f7440f7e518e68666faa9900ace6 (diff)
Merge pull request #3207 from loogg/mlw
去除sal shut_down后释放socket导致close失败的问题
Diffstat (limited to 'components')
-rw-r--r--components/net/sal_socket/socket/net_sockets.c4
-rw-r--r--components/net/sal_socket/src/sal_socket.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/components/net/sal_socket/socket/net_sockets.c b/components/net/sal_socket/socket/net_sockets.c
index 12024c8173..a53b2f1f9c 100644
--- a/components/net/sal_socket/socket/net_sockets.c
+++ b/components/net/sal_socket/socket/net_sockets.c
@@ -105,9 +105,7 @@ int shutdown(int s, int how)
rt_set_errno(-ENOTSOCK);
error = -1;
}
-
- /* socket has been closed, delete it from file system fd */
- fd_put(d);
+
fd_put(d);
return error;
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index 4a9056838d..2d8e703845 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -701,8 +701,6 @@ int sal_shutdown(int socket, int how)
error = -1;
}
- /* delete socket */
- socket_delete(socket);
return error;
}