diff options
author | David S. Miller <davem@davemloft.net> | 2010-10-09 00:51:11 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-09 00:51:11 +0400 |
commit | 9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218 (patch) | |
tree | 0e9262488832ad27f6ba42680bf104872fa3c697 /drivers/net/wireless/rt2x00/rt61pci.c | |
parent | 8391d07b80e8da957cd888870e23f8e218438622 (diff) | |
parent | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (diff) | |
download | linux-9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218.tar.xz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 97b3935f615b..af548c87f108 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -2630,12 +2630,13 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) * As rt61 has a global fallback table we cannot specify * more then one tx rate per frame but since the hw will * try several rates (based on the fallback table) we should - * still initialize max_rates to the maximum number of rates + * initialize max_report_rates to the maximum number of rates * we are going to try. Otherwise mac80211 will truncate our * reported tx rates and the rc algortihm will end up with * incorrect data. */ - rt2x00dev->hw->max_rates = 7; + rt2x00dev->hw->max_rates = 1; + rt2x00dev->hw->max_report_rates = 7; rt2x00dev->hw->max_rate_tries = 1; /* |