aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 97d9095037b9..e7f544c404bc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -89,7 +89,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
89 memset(skbdesc, 0, sizeof(*skbdesc)); 89 memset(skbdesc, 0, sizeof(*skbdesc));
90 skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED; 90 skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
91 91
92 if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb)) { 92 if (rt2x00queue_write_tx_frame(queue, skb)) {
93 WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n"); 93 WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");
94 return NETDEV_TX_BUSY; 94 return NETDEV_TX_BUSY;
95 } 95 }
@@ -158,7 +158,7 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
158 } 158 }
159 } 159 }
160 160
161 if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb)) { 161 if (rt2x00queue_write_tx_frame(queue, skb)) {
162 ieee80211_stop_queue(rt2x00dev->hw, qid); 162 ieee80211_stop_queue(rt2x00dev->hw, qid);
163 return NETDEV_TX_BUSY; 163 return NETDEV_TX_BUSY;
164 } 164 }
@@ -166,9 +166,6 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
166 if (rt2x00queue_full(queue)) 166 if (rt2x00queue_full(queue))
167 ieee80211_stop_queue(rt2x00dev->hw, qid); 167 ieee80211_stop_queue(rt2x00dev->hw, qid);
168 168
169 if (rt2x00dev->ops->lib->kick_tx_queue)
170 rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, qid);
171
172 return NETDEV_TX_OK; 169 return NETDEV_TX_OK;
173} 170}
174EXPORT_SYMBOL_GPL(rt2x00mac_tx); 171EXPORT_SYMBOL_GPL(rt2x00mac_tx);