From 64fd681be7f077640dc94919ebe56892a4f703c8 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Mon, 14 Jun 2010 22:09:41 +0200 Subject: [PATCH] --- yaml --- r: 203059 b: refs/heads/master c: ecb7cab59a2b8c0ec1aab6ac903def1d5a81d32b h: refs/heads/master i: 203057: f7d9a2f4119b049c9354ec5ab05b43e5cbe6f058 203055: 9007dcc27a132f601791e6e2bbdb954be0f09933 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2800pci.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c374ee0d3133..526248b56dc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd6dcb883a0e34de90c64a9352c5225066ee7d72 +refs/heads/master: ecb7cab59a2b8c0ec1aab6ac903def1d5a81d32b diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800pci.c b/trunk/drivers/net/wireless/rt2x00/rt2800pci.c index b5a871eb8881..eeecedb63cd0 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2800pci.c @@ -903,8 +903,12 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) txdesc.retry = 7; } - __set_bit(TXDONE_FALLBACK, &txdesc.flags); - + /* + * the frame was retried at least once + * -> hw used fallback rates + */ + if (txdesc.retry) + __set_bit(TXDONE_FALLBACK, &txdesc.flags); rt2x00pci_txdone(entry, &txdesc); }