[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 2a5defe011e724abbf062ffc5513a85dece1c22b..0da013f3b0d8ff39e2c5259f6a8e084ef655c5fe 100644 (file)
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1368,13 +1368,6 @@ int libertas_prepare_and_send_command(wlan_private * priv,
                                           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 affb1eeb6a5e7538531b63b48ba4d5125eb0c018..e91d819555ebb0ad6aa122d592c6aa7f3b0f3de1 100644 (file)
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -702,9 +702,6 @@ static inline int handle_cmd_response(u16 respcmd,
                        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 aad92ded730eecf93344623c40ee53ff4add5574..9e18f012333c0af499109dd9d5826b6a5f562e9a 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -376,7 +376,6 @@ struct _wlan_adapter {
 
        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 7d14f9c2aff63c83761f26120f9f655b0086af69..1fb0f91e538a4ed0849c4ffda2b245bb11617e09 100644 (file)
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -949,7 +949,7 @@ static struct iw_statistics *wlan_get_wireless_stats(struct net_device *dev)
        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;