redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

NFC: Use llcp_allocate_pdu to build the DISC frames

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

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2012-10-05 01:09:07 +02:00
parent a6a0915f8c
commit 922239064b
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/nfc/llcp/commands.c
View file

@ -261,7 +261,6 @@ int nfc_llcp_disconnect(struct nfc_llcp_sock *sock)
struct sk_buff *skb; struct sk_buff *skb;
struct nfc_dev *dev; struct nfc_dev *dev;
struct nfc_llcp_local *local; struct nfc_llcp_local *local;
u16 size = 0;
pr_debug("Sending DISC\n"); pr_debug("Sending DISC\n");
@ -273,17 +272,10 @@ int nfc_llcp_disconnect(struct nfc_llcp_sock *sock)
if (dev == NULL) if (dev == NULL)
return -ENODEV; return -ENODEV;
size += LLCP_HEADER_SIZE; skb = llcp_allocate_pdu(sock, LLCP_PDU_DISC, 0);
size += dev->tx_headroom + dev->tx_tailroom + NFC_HEADER_SIZE;
skb = alloc_skb(size, GFP_ATOMIC);
if (skb == NULL) if (skb == NULL)
return -ENOMEM; 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); skb_queue_tail(&local->tx_queue, skb);
return 0; return 0;