rt2x00dev.c: fix-up merge damage

This restores the effects of "rt2x00: Don't count retries as failure".

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f7a44170c0257c6d31da587b0ebd154854958b1b..dc5ab90a52c3a44e59c9214a022f7b6cd330fea6 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -507,7 +507,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
        rt2x00dev->link.qual.tx_success +=
            test_bit(TXDONE_SUCCESS, &txdesc->flags);
        rt2x00dev->link.qual.tx_failed +=
-           txdesc->retry + !!test_bit(TXDONE_FAILURE, &txdesc->flags);
+           test_bit(TXDONE_FAILURE, &txdesc->flags);
 
        /*
         * Initialize TX status