From cd761e68c8134855a9d5389dad73c93e20592800 Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Thu, 6 Dec 2007 13:50:30 +0100 Subject: [PATCH] --- yaml --- r: 79115 b: refs/heads/master c: 09d4fad6e8972061fbb0e2e5ae9e686d84f57af6 h: refs/heads/master i: 79113: 69614cebc6d505783d4df491dbfd8e6f57d33dc7 79111: 75d346c2ee7b11483df44e763e73cfaffbb41c01 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/cmdresp.c | 2 +- trunk/drivers/net/wireless/libertas/if_cs.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 42fb17f3e415..44192c0e2c88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abe3ed14d39adcea9ae186cf741b15d11544458f +refs/heads/master: 09d4fad6e8972061fbb0e2e5ae9e686d84f57af6 diff --git a/trunk/drivers/net/wireless/libertas/cmdresp.c b/trunk/drivers/net/wireless/libertas/cmdresp.c index 6a43de772aa0..22a697363381 100644 --- a/trunk/drivers/net/wireless/libertas/cmdresp.c +++ b/trunk/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; 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/trunk/drivers/net/wireless/libertas/if_cs.c b/trunk/drivers/net/wireless/libertas/if_cs.c index 54b1ba3e250a..8508260a286b 100644 --- a/trunk/drivers/net/wireless/libertas/if_cs.c +++ b/trunk/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);