Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92223906 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

NFC: Use llcp_allocate_pdu to build the DISC frames 



We no longer need to be atomic as this is only called from
llcp_sock_release().

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent a6a0915f

net/nfc/llcp/commands.c

+1 −9
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ int nfc_llcp_disconnect(struct nfc_llcp_sock *sock) 
	struct sk_buff *skb;

	struct nfc_dev *dev;

	struct nfc_llcp_local *local;

	u16 size = 0;



	pr_debug("Sending DISC\n");
@@ -273,17 +272,10 @@ int nfc_llcp_disconnect(struct nfc_llcp_sock *sock) 
	if (dev == NULL)

		return -ENODEV;



	size += LLCP_HEADER_SIZE;

	size += dev->tx_headroom + dev->tx_tailroom + NFC_HEADER_SIZE;



	skb = alloc_skb(size, GFP_ATOMIC);

	skb = llcp_allocate_pdu(sock, LLCP_PDU_DISC, 0);

	if (skb == NULL)

		return -ENOMEM;



	skb_reserve(skb, dev->tx_headroom + NFC_HEADER_SIZE);



	skb = llcp_add_header(skb, sock->dsap, sock->ssap, LLCP_PDU_DISC);



	skb_queue_tail(&local->tx_queue, skb);



	return 0;