[PATCH] libertas: remove adapter->txrate
The value of txrate was only set by a CMD_802_11_TX_RATE_QUERY command,
but there was no code in the driver that ever issued this command.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 2a5defe..0da013f 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1368,13 +1368,6 @@
S_DS_GEN);
ret = 0;
break;
- case CMD_802_11_TX_RATE_QUERY:
- cmdptr->command = cpu_to_le16(CMD_802_11_TX_RATE_QUERY);
- cmdptr->size = cpu_to_le16(sizeof(struct cmd_tx_rate_query) +
- S_DS_GEN);
- adapter->txrate = 0;
- ret = 0;
- break;
default:
lbs_deb_host("PREP_CMD: unknown command 0x%04x\n", cmd_no);
ret = -1;
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index affb1ee..e91d819 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -702,9 +702,6 @@
memcpy(adapter->cur_cmd->pdata_buf, &resp->params.mesh,
sizeof(resp->params.mesh));
break;
- case CMD_RET(CMD_802_11_TX_RATE_QUERY):
- priv->adapter->txrate = resp->params.txrate.txrate;
- break;
default:
lbs_deb_host("CMD_RESP: unknown cmd response 0x%04x\n",
resp->command);
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index aad92de..9e18f01 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -376,7 +376,6 @@
struct cmd_ds_802_11_get_log logmsg;
- u16 txrate;
u32 linkmode;
u32 radiomode;
u8 fw_ready;
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 7d14f9c..1fb0f91 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -949,7 +949,7 @@
priv->wstats.discard.misc = le16_to_cpu(adapter->logmsg.ackfailure);
/* Calculate quality */
- priv->wstats.qual.qual = min_t(u32, quality, 100);
+ priv->wstats.qual.qual = min_t(u8, quality, 100);
priv->wstats.qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
stats_valid = 1;