Return-Path: MIME-Version: 1.0 Subject: RE: [PATCH V2] btsdio: fix tx error path Date: Mon, 6 Oct 2008 14:05:41 +0200 Message-ID: In-Reply-To: <1223294503.11272.158.camel@violet.holtmann.net> References: <1223293223-21162-1-git-send-email-tomas.winkler@intel.com> <1223294503.11272.158.camel@violet.holtmann.net> From: "Winkler, Tomas" To: "Marcel Holtmann" Cc: , Content-Type: text/plain; charset="us-ascii" List-ID: >-----Original Message----- >From: Marcel Holtmann [mailto:marcel@holtmann.org] >Sent: Monday, October 06, 2008 2:02 PM >To: Winkler, Tomas >Cc: linux-bluetooth@vger.kernel.org; linux-kernel@vger.kernel.org >Subject: Re: [PATCH V2] btsdio: fix tx error path > >Hi Tomas, > >> 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 =3D 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; >> } > >thanks, but I already fixed that one manually in my tree :) Yeah I guessed that, resubmitted just for the protocol. Tomas --------------------------------------------------------------------- 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.