From c68d7feac6c61feec7bf6328958a2121545e0171 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 5 Oct 2012 01:09:07 +0200 Subject: [PATCH] --- yaml --- r: 340937 b: refs/heads/master c: 922239064bb39b4ed9329ffd9418c20f8d64cbbb h: refs/heads/master i: 340935: 32e1b7e6d9e52b1a626b23e16202a7a321398b9a v: v3 --- [refs] | 2 +- trunk/net/nfc/llcp/commands.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 5948de972b37..5af3623fd939 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6a0915f8c2d794030097ebe0adb85ee904ebac3 +refs/heads/master: 922239064bb39b4ed9329ffd9418c20f8d64cbbb diff --git a/trunk/net/nfc/llcp/commands.c b/trunk/net/nfc/llcp/commands.c index c45ccd6c094c..5e33cba43936 100644 --- a/trunk/net/nfc/llcp/commands.c +++ b/trunk/net/nfc/llcp/commands.c @@ -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;