Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ipw2x00/ipw2200.c

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;
 
         /*