From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753412AbYJFLmU (ORCPT ); Mon, 6 Oct 2008 07:42:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752423AbYJFLmK (ORCPT ); Mon, 6 Oct 2008 07:42:10 -0400 Received: from mga03.intel.com ([143.182.124.21]:49537 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752295AbYJFLmJ (ORCPT ); Mon, 6 Oct 2008 07:42:09 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.33,367,1220252400"; d="scan'208";a="55633042" From: Tomas Winkler To: marcel@holtmann.org Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler Subject: [PATCH V2] btsdio: fix tx error path Date: Mon, 6 Oct 2008 13:40:23 +0200 Message-Id: <1223293223-21162-1-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 1.6.0.2.229.g1293c Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes accumulating of the header in case packet was requeued in the error path. Signed-off-by: Tomas Winkler Cc: Marcel Holtmann --- drivers/bluetooth/btsdio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c index 58630cc..c422e89 100644 --- a/drivers/bluetooth/btsdio.c +++ b/drivers/bluetooth/btsdio.c @@ -91,6 +91,7 @@ static int btsdio_tx_packet(struct btsdio_data *data, struct sk_buff *skb) err = sdio_writesb(data->func, REG_TDAT, skb->data, skb->len); if (err < 0) { + skb_pull(skb, 4); sdio_writeb(data->func, 0x01, REG_PC_WRT, NULL); return err; } -- 1.5.4.3 --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.