diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-06-10 09:06:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-10 09:06:52 -0400 |
commit | cb14cb791c57b45ba32c92b041420cdc1b1a0283 (patch) | |
tree | 89333c407873b5d0a6a6849a94294e952a866bb7 /drivers/net/wireless/rt2x00/rt2x00dev.c | |
parent | 65b53e4cc90e59936733b3b95b9451d2ca47528d (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index f7a44170c025..dc5ab90a52c3 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, | |||
507 | rt2x00dev->link.qual.tx_success += | 507 | rt2x00dev->link.qual.tx_success += |
508 | test_bit(TXDONE_SUCCESS, &txdesc->flags); | 508 | test_bit(TXDONE_SUCCESS, &txdesc->flags); |
509 | rt2x00dev->link.qual.tx_failed += | 509 | rt2x00dev->link.qual.tx_failed += |
510 | txdesc->retry + !!test_bit(TXDONE_FAILURE, &txdesc->flags); | 510 | test_bit(TXDONE_FAILURE, &txdesc->flags); |
511 | 511 | ||
512 | /* | 512 | /* |
513 | * Initialize TX status | 513 | * Initialize TX status |