From: John W. Linville Date: Tue, 10 Jun 2008 13:06:52 +0000 (-0400) Subject: rt2x00dev.c: fix-up merge damage X-Git-Tag: v2.6.27-rc1~969^2~335 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb14cb791c57b45ba32c92b041420cdc1b1a0283;p=linux-2.6 rt2x00dev.c: fix-up merge damage This restores the effects of "rt2x00: Don't count retries as failure". Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index f7a44170c0..dc5ab90a52 100644 --- 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