---

yaml --- r: 66473 b: refs/heads/master c: cad9d9b h: refs/heads/master i: 66471: dbbfa26 v: v3
git-mirror · Oct 10, 2007 · 5c100da · 5c100da
1 parent 105650c
commit 5c100da
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b20c520763a6fe1aabde27f6ba017a67f22f90d5
+refs/heads/master: cad9d9b17a4ab80da1593de004a1163b359de268
diff --git a/trunk/drivers/net/wireless/libertas/cmd.c b/trunk/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/trunk/drivers/net/wireless/libertas/cmdresp.c b/trunk/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/trunk/drivers/net/wireless/libertas/dev.h b/trunk/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/trunk/drivers/net/wireless/libertas/wext.c b/trunk/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;