diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-08-02 13:06:11 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:59 -0400 |
commit | fcff0e0856351b201016cd9267cadcf6a8e988d5 (patch) | |
tree | d1fa06f4b6a008310585ff3fc8af3aa68e133e51 /drivers/net/wireless/libertas/tx.c | |
parent | e2aa334bee4ae9fe27f26b0732c0443d2f11a8af (diff) |
[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>
Diffstat (limited to 'drivers/net/wireless/libertas/tx.c')
-rw-r--r-- | drivers/net/wireless/libertas/tx.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index 56d84027ec2b..bb6e17506a41 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) | |||
58 | */ | 58 | */ |
59 | static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) | 59 | static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) |
60 | { | 60 | { |
61 | wlan_adapter *adapter = priv->adapter; | ||
62 | int ret = 0; | 61 | int ret = 0; |
63 | struct txpd localtxpd; | 62 | struct txpd localtxpd; |
64 | struct txpd *plocaltxpd = &localtxpd; | 63 | struct txpd *plocaltxpd = &localtxpd; |
@@ -86,9 +85,6 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) | |||
86 | /* offset of actual data */ | 85 | /* offset of actual data */ |
87 | plocaltxpd->tx_packet_location = cpu_to_le32(sizeof(struct txpd)); | 86 | plocaltxpd->tx_packet_location = cpu_to_le32(sizeof(struct txpd)); |
88 | 87 | ||
89 | /* TxCtrl set by user or default */ | ||
90 | plocaltxpd->tx_control = cpu_to_le32(adapter->pkttxctrl); | ||
91 | |||
92 | p802x_hdr = skb->data; | 88 | p802x_hdr = skb->data; |
93 | if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) { | 89 | if (priv->adapter->radiomode == WLAN_RADIOMODE_RADIOTAP) { |
94 | 90 | ||
@@ -99,7 +95,6 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb) | |||
99 | new_rate = convert_radiotap_rate_to_mv(pradiotap_hdr->rate); | 95 | new_rate = convert_radiotap_rate_to_mv(pradiotap_hdr->rate); |
100 | if (new_rate != 0) { | 96 | if (new_rate != 0) { |
101 | /* use new tx_control[4:0] */ | 97 | /* use new tx_control[4:0] */ |
102 | new_rate |= (adapter->pkttxctrl & ~0x1f); | ||
103 | plocaltxpd->tx_control = cpu_to_le32(new_rate); | 98 | plocaltxpd->tx_control = cpu_to_le32(new_rate); |
104 | } | 99 | } |
105 | 100 | ||