diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-27 10:32:07 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-27 10:32:07 +0300 |
| commit | 0e4daea31d8312dd9f957a62717d4b5f31ef494c (patch) | |
| tree | a9edacaf51413354d0df35f6faf7f002a6f34bf0 /net/tipc/socket.c | |
| parent | d5b3d02d0b107345f2a6ecb5b06f98356f5c97ab (diff) | |
| parent | 44c026a73be8038f03dbdeef028b642880cf1511 (diff) | |
| download | linux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.tar.xz | |
Merge 6.4-rc3 into tty-next
We need the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 37edfe10f8c6..dd73d71c02a9 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -314,9 +314,9 @@ static void tsk_rej_rx_queue(struct sock *sk, int error) tipc_sk_respond(sk, skb, error); } -static bool tipc_sk_connected(struct sock *sk) +static bool tipc_sk_connected(const struct sock *sk) { - return sk->sk_state == TIPC_ESTABLISHED; + return READ_ONCE(sk->sk_state) == TIPC_ESTABLISHED; } /* tipc_sk_type_connectionless - check if the socket is datagram socket |