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

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

[PATCH] libertas: remove adapter->pkttxctrl 



The variable was initialized to 0 and nowhere else changed, so basically
the per-packet TX control wasn't used.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e2aa334b

drivers/net/wireless/libertas/dev.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -376,8 +376,6 @@ struct _wlan_adapter { 




	struct cmd_ds_802_11_get_log logmsg;

	struct cmd_ds_802_11_get_log logmsg;





	u32 pkttxctrl;



	u16 txrate;

	u16 txrate;

	u32 linkmode;

	u32 linkmode;

	u32 radiomode;

	u32 radiomode;

drivers/net/wireless/libertas/main.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1067,7 +1067,6 @@ static void wlan_init_adapter(wlan_private * priv) 
	adapter->intcounter = 0;

	adapter->intcounter = 0;





	adapter->currenttxskb = NULL;

	adapter->currenttxskb = NULL;

	adapter->pkttxctrl = 0;





	memset(&adapter->tx_queue_ps, 0, NR_TX_QUEUE*sizeof(struct sk_buff*));

	memset(&adapter->tx_queue_ps, 0, NR_TX_QUEUE*sizeof(struct sk_buff*));

	adapter->tx_queue_idx = 0;

	adapter->tx_queue_idx = 0;

drivers/net/wireless/libertas/tx.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u8 rate) 
 */

 */

static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)

static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)

{

{

	wlan_adapter *adapter = priv->adapter;

	int ret = 0;

	int ret = 0;

	struct txpd localtxpd;

	struct txpd localtxpd;

	struct txpd *plocaltxpd = &localtxpd;

	struct txpd *plocaltxpd = &localtxpd;
@@ -86,9 +85,6 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) 
	/* offset of actual data */

	/* offset of actual data */

	plocaltxpd->tx_packet_location = cpu_to_le32(sizeof(struct txpd));

	plocaltxpd->tx_packet_location = cpu_to_le32(sizeof(struct txpd));





	/* TxCtrl set by user or default */

	plocaltxpd->tx_control = cpu_to_le32(adapter->pkttxctrl);



	p802x_hdr = skb->data;

	p802x_hdr = skb->data;

	if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) {

	if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) {
@@ -99,7 +95,6 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) 
		new_rate = convert_radiotap_rate_to_mv(pradiotap_hdr->rate);

		new_rate = convert_radiotap_rate_to_mv(pradiotap_hdr->rate);

		if (new_rate != 0) {

		if (new_rate != 0) {

			/* use new tx_control[4:0] */

			/* use new tx_control[4:0] */

			new_rate |= (adapter->pkttxctrl & ~0x1f);

			plocaltxpd->tx_control = cpu_to_le32(new_rate);

			plocaltxpd->tx_control = cpu_to_le32(new_rate);

		}

		}