Commit 44cd5765 authored Mar 02, 2022 by Krzysztof Kozlowski Committed by David S. Miller Mar 03, 2022

nfc: llcp: Revert "NFC: Keep socket alive until the DISC PDU is actually sent"



This reverts commit 17f7ae16.

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>

parent a06b8044

net/nfc/llcp.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@
		enum llcp_state {
		LLCP_CONNECTED = 1, /* wait_for_packet() wants that */
		LLCP_CONNECTING,
		LLCP_DISCONNECTING,
		LLCP_CLOSED,
		LLCP_BOUND,
		LLCP_LISTEN,

net/nfc/llcp_core.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -737,13 +737,6 @@ static void nfc_llcp_tx_work(struct work_struct *work)
		print_hex_dump_debug("LLCP Tx: ", DUMP_PREFIX_OFFSET,
		16, 1, skb->data, skb->len, true);

		if (ptype == LLCP_PDU_DISC && sk != NULL &&
		sk->sk_state == LLCP_DISCONNECTING) {
		nfc_llcp_sock_unlink(&local->sockets, sk);
		sock_orphan(sk);
		sock_put(sk);
		}

		if (ptype == LLCP_PDU_I)
		copy_skb = skb_copy(skb, GFP_ATOMIC);

net/nfc/llcp_sock.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -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);