aboutsummaryrefslogtreecommitdiff
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorJiri Kosina <[email protected]>2022-01-10 09:55:44 +0100
committerJiri Kosina <[email protected]>2022-01-10 09:55:44 +0100
commitc524559acd5d0903fa6e3b8e608bf5851de7217a (patch)
tree91acebdb63e32973d08f93c21f44aae0f4c5ccc8 /net/unix/af_unix.c
parentfce0d275843712db6f9b611856f539da29ad5529 (diff)
parent8590222e4b021054a7167a4dd35b152a8ed7018e (diff)
Merge branch 'for-5.17/hidraw' into for-linus
- locking performance improvement for hidraw code (André Almeida)
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r--net/unix/af_unix.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 78e08e82c08c..b0bfc78e421c 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2882,9 +2882,6 @@ static int unix_shutdown(struct socket *sock, int mode)
unix_state_lock(sk);
sk->sk_shutdown |= mode;
- if ((sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) &&
- mode == SHUTDOWN_MASK)
- sk->sk_state = TCP_CLOSE;
other = unix_peer(sk);
if (other)
sock_hold(other);