diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2009-11-23 16:44:48 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-28 15:04:34 -0500 |
commit | 6a6f455ca4120ae0c6a1bb77d58ba2f5e3e96afd (patch) | |
tree | 1509eb3d0f3cc2d1cc35efc52b71fdfd6f8175d6 /drivers/net/wireless/rt2x00/rt2x00mac.c | |
parent | 38a522e6bc0fcd9848b91366ec899f1c2cb23609 (diff) |
rt2x00: Remove unused variable frame_control from rt2x00mac_tx.
As additional fallout also remove the also unused variable ieee80211hdr.
Reported-by: Johannes Stezenbach <js@sig21.net>
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <ivdoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 9c90ceb0ffcc..de549c244ed8 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -103,10 +103,8 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
103 | { | 103 | { |
104 | struct rt2x00_dev *rt2x00dev = hw->priv; | 104 | struct rt2x00_dev *rt2x00dev = hw->priv; |
105 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 105 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
106 | struct ieee80211_hdr *ieee80211hdr = (struct ieee80211_hdr *)skb->data; | ||
107 | enum data_queue_qid qid = skb_get_queue_mapping(skb); | 106 | enum data_queue_qid qid = skb_get_queue_mapping(skb); |
108 | struct data_queue *queue; | 107 | struct data_queue *queue; |
109 | u16 frame_control; | ||
110 | 108 | ||
111 | /* | 109 | /* |
112 | * Mac80211 might be calling this function while we are trying | 110 | * Mac80211 might be calling this function while we are trying |
@@ -141,7 +139,6 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
141 | * either RTS or CTS-to-self frame and handles everything | 139 | * either RTS or CTS-to-self frame and handles everything |
142 | * inside the hardware. | 140 | * inside the hardware. |
143 | */ | 141 | */ |
144 | frame_control = le16_to_cpu(ieee80211hdr->frame_control); | ||
145 | if ((tx_info->control.rates[0].flags & (IEEE80211_TX_RC_USE_RTS_CTS | | 142 | if ((tx_info->control.rates[0].flags & (IEEE80211_TX_RC_USE_RTS_CTS | |
146 | IEEE80211_TX_RC_USE_CTS_PROTECT)) && | 143 | IEEE80211_TX_RC_USE_CTS_PROTECT)) && |
147 | !rt2x00dev->ops->hw->set_rts_threshold) { | 144 | !rt2x00dev->ops->hw->set_rts_threshold) { |