Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fcff0e0856351b201016cd9267cadcf6a8e988d5
Commit:     fcff0e0856351b201016cd9267cadcf6a8e988d5
Parent:     e2aa334bee4ae9fe27f26b0732c0443d2f11a8af
Author:     Holger Schurig <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 13:06:11 2007 -0400
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:49:59 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/dev.h  |    2 --
 drivers/net/wireless/libertas/main.c |    1 -
 drivers/net/wireless/libertas/tx.c   |    5 -----
 3 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/libertas/dev.h 
b/drivers/net/wireless/libertas/dev.h
index 1dcfb05..aad92de 100644
--- 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 1d439cd..da418db 100644
--- 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 56d8402..bb6e175 100644
--- 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);
                }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to