diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2022-03-02 20:25:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-03 11:43:37 +0100 |
| commit | 44cd5765495b30bc2527463f4a4b8c028e11535b (patch) | |
| tree | f25b8c831867529c09c72c472d67e6d75b1ccc6a /net/nfc/llcp_sock.c | |
| parent | nfc: llcp: protect nfc_llcp_sock_unlink() calls (diff) | |
| download | linux-44cd5765495b30bc2527463f4a4b8c028e11535b.tar.xz linux-44cd5765495b30bc2527463f4a4b8c028e11535b.zip | |
nfc: llcp: Revert "NFC: Keep socket alive until the DISC PDU is actually sent"
This reverts commit 17f7ae16aef1f58bc4af4c7a16b8778a91a30255.
The commit brought a new socket state LLCP_DISCONNECTING, which was
never set, only read, so socket could never set to such state.
Remove the dead code.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc/llcp_sock.c')
| -rw-r--r-- | net/nfc/llcp_sock.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index 5c5705f5028b..4ca35791c93b 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -641,13 +641,6 @@ static int llcp_sock_release(struct socket *sock) release_sock(sk); - /* Keep this sock alive and therefore do not remove it from the sockets - * list until the DISC PDU has been actually sent. Otherwise we would - * reply with DM PDUs before sending the DISC one. - */ - if (sk->sk_state == LLCP_DISCONNECTING) - return err; - out: sock_orphan(sk); sock_put(sk); |