Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cad9d9b1 authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files

[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: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b20c5207

drivers/net/wireless/libertas/cmd.c

+0 −7
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/libertas/cmdresp.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/libertas/dev.h

+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ struct _wlan_adapter { 


	struct cmd_ds_802_11_get_log logmsg;



	u16 txrate;

	u32 linkmode;

	u32 radiomode;

	u8 fw_ready;

drivers/net/wireless/libertas/wext.c

+1 −1
Original line number Diff line number Diff line
@@ -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;