rt2x00: Correctly set ACK bit in tx descriptors

Add a flag to struct txdata_entry_desc that specifies whether an ack for the
frame is to be expected. Use this flag to set the ACK bit in the tx descriptor.
Previously, the ACK bit could be set incorrectly on CTS-to-self frames, so they
caused retries and were reported to be failed in the txdone handlers.

Signed-off-by: Mattias Nissler <mattias.nissler@gmx.de>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 304830b8d16d..3ab1fb993d6f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -629,12 +629,21 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         tx_rate = control->tx_rate;
 
         /*
+         * Check whether this frame is to be acked
+         */
+        if (!(control->flags & IEEE80211_TXCTL_NO_ACK))
+                __set_bit(ENTRY_TXD_ACK, &desc.flags);
+
+        /*
          * Check if this is a RTS/CTS frame
          */
         if (is_rts_frame(frame_control) || is_cts_frame(frame_control)) {
                 __set_bit(ENTRY_TXD_BURST, &desc.flags);
-                if (is_rts_frame(frame_control))
+                if (is_rts_frame(frame_control)) {
                         __set_bit(ENTRY_TXD_RTS_FRAME, &desc.flags);
+                        __set_bit(ENTRY_TXD_ACK, &desc.flags);
+                } else
+                        __clear_bit(ENTRY_TXD_ACK, &desc.flags);
                 if (control->rts_cts_rate)
                         tx_rate = control->rts_cts_rate;
         }