Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753166AbcDUOqd (ORCPT ); Thu, 21 Apr 2016 10:46:33 -0400 Received: from gw.hale.at ([83.64.51.210]:52608 "EHLO gw.hale.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752783AbcDUOov (ORCPT ); Thu, 21 Apr 2016 10:44:51 -0400 X-HALE-Mailborder-Watermark: 1461854686.37086@5wc6b2xb3lUlAaYy4qmt9g X-HALE-Mailborder-From: michael.thalmeier@hale.at X-HALE-Mailborder-SpamCheck: not spam, SpamAssassin (zwischen gespeichert, Wertung=-2.899, benoetigt 3, autolearn=not spam, ALL_TRUSTED -1.00, BAYES_00 -1.90, URIBL_BLOCKED 0.00) X-HALE-Mailborder-IP-Protocol: IPv4 X-HALE-Mailborder: Found to be clean X-HALE-Mailborder-ID: B60A02C1504.A7A41 X-HALE-Mailborder-Information: Please contact your admin for more information From: Michael Thalmeier To: Samuel Ortiz Cc: Lauro Ramos Venancio , Aloisio Almeida Jr , linux-kernel@vger.kernel.org, linux-nfc@ml01.01.org, michael@thalmeier.at Subject: [PATCH 09/11] NFC: pn533: use nfc_alloc_recv_skb for skb allocation Date: Thu, 21 Apr 2016 16:43:57 +0200 Message-Id: <1461249839-16962-10-git-send-email-michael.thalmeier@hale.at> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461249839-16962-1-git-send-email-michael.thalmeier@hale.at> References: <1461249839-16962-1-git-send-email-michael.thalmeier@hale.at> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 843 Lines: 25 When multiple receive frames need to be put together in pn533_build_response we need to use nfc_alloc_recv_skb instead of the normal alloc_skb. Otherwise the nfc core causes an skb error when it tries to push the status byte in front of the data. Signed-off-by: Michael Thalmeier --- drivers/nfc/pn533/pn533.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index c06d22f..ae13277 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -1942,7 +1942,7 @@ static struct sk_buff *pn533_build_response(struct pn533 *dev) dev_dbg(dev->dev, "%s total length %d\n", __func__, skb_len); - skb = alloc_skb(skb_len, GFP_KERNEL); + skb = nfc_alloc_recv_skb(skb_len, GFP_KERNEL); if (skb == NULL) goto out; -- 2.5.5