[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: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 1dcfb05f544690cc57820f11c14944083a154705..aad92ded730eecf93344623c40ee53ff4add5574 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -376,8 +376,6 @@ struct _wlan_adapter {
 
        struct cmd_ds_802_11_get_log logmsg;
 
-       u32 pkttxctrl;
-
        u16 txrate;
        u32 linkmode;
        u32 radiomode;

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 1d439cd3f436d368c59cf3528b747034d7437396..da418dbe8865b6574ced5e6123ab8ccb19e01647 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1067,7 +1067,6 @@ static void wlan_init_adapter(wlan_private * priv)
        adapter->intcounter = 0;
 
        adapter->currenttxskb = NULL;
-       adapter->pkttxctrl = 0;
 
        memset(&adapter->tx_queue_ps, 0, NR_TX_QUEUE*sizeof(struct sk_buff*));
        adapter->tx_queue_idx = 0;

diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index 56d84027ec2b82622ec0461a88f4045508b23aed..bb6e17506a41f3aa15840a7c439d626202f7a84a 100644 (file)
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u8 rate)
  */
 static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
 {
-       wlan_adapter *adapter = priv->adapter;
        int ret = 0;
        struct txpd localtxpd;
        struct txpd *plocaltxpd = &localtxpd;
@@ -86,9 +85,6 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
        /* offset of actual data */
        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;
        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);
                if (new_rate != 0) {
                        /* use new tx_control[4:0] */
-                       new_rate |= (adapter->pkttxctrl & ~0x1f);
                        plocaltxpd->tx_control = cpu_to_le32(new_rate);
                }