From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from vs166246.vserver.de ([62.75.166.246]:39698 "EHLO vs166246.vserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751540AbXLJPwe (ORCPT ); Mon, 10 Dec 2007 10:52:34 -0500 From: Michael Buesch To: David Woodhouse Subject: Re: [PATCH 14/48] libertas: fix data packet size errors Date: Mon, 10 Dec 2007 16:49:39 +0100 Cc: John Linville , Dan Williams , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Message-Id: <200712101649.39391.mb@bu3sch.de> (sfid-20071210_155240_236058_13CDB429) Sender: linux-wireless-owner@vger.kernel.org List-ID: On Monday 10 December 2007 16:45:48 David Woodhouse wrote: > From: Holger Schurig > Date: Thu, 6 Dec 2007 13:50:30 +0100 > > I wondered about junk bytes at the end when using "lbsdebug +hex +host" > until I noticed that firmware for the CF card sends my extranous bytes. > It says "I have 20 bytes", I take 20 bytes, but the last 8 bytes of this > are just data junk. > > Also, in the new lbs_cmd() where was a size miscalulation > that made itself clear after fixing this bug. > > Signed-off-by: Holger Schurig > Signed-off-by: David Woodhouse > --- > drivers/net/wireless/libertas/cmdresp.c | 2 +- > drivers/net/wireless/libertas/if_cs.c | 3 +++ > 2 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c > index 6a43de7..22a6973 100644 > --- a/drivers/net/wireless/libertas/cmdresp.c > +++ b/drivers/net/wireless/libertas/cmdresp.c > @@ -882,7 +882,7 @@ int lbs_process_rx_command(struct lbs_private *priv) > > if (adapter->cur_cmd->pdata_size) { > struct cmd_ds_gen *r = (struct cmd_ds_gen *)resp; > - u16 sz = cpu_to_le16(resp->size); > + u16 sz = cpu_to_le16(resp->size) - S_DS_GEN; Whoops, something's wrong here. You are subtracting from a LE value. > if (sz > *adapter->cur_cmd->pdata_size) { > lbs_pr_err("response 0x%04x doesn't fit into " > "buffer (%d > %d)\n", respcmd, > diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c > index 54b1ba3..8508260 100644 > --- a/drivers/net/wireless/libertas/if_cs.c > +++ b/drivers/net/wireless/libertas/if_cs.c > @@ -373,6 +373,9 @@ static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len) > if (*len & 1) > data[*len-1] = if_cs_read8(priv->card, IF_CS_C_CMD); > > + /* This is a workaround for a firmware that reports too much > + * bytes */ > + *len -= 8; > ret = 0; > out: > lbs_deb_leave_args(LBS_DEB_CS, "ret %d, len %d", ret, *len); -- Greetings Michael.