rt2x00: Fix rt2800lib RF chip programming selection.

Mirror the legacy Ralink driver with respect to rt2800 RF register
programming. Execute rt2800_config_channel_rt3x for all RF2020,
RF3020, RF3021 & RF3022 chipsets when operating on RT3070 devices.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 9656699c6ef675a103c15aee8f4a0aa32eb0e626..53baa09082d3ff0c403cd21f90c8bde450f3c011 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -806,10 +806,14 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
        unsigned int tx_pin;
        u8 bbp;
 
-       if (rt2x00_rev(&rt2x00dev->chip) != RT3070_VERSION)
-               rt2800_config_channel_rt2x(rt2x00dev, conf, rf, info);
-       else
+       if (rt2x00_rt(&rt2x00dev->chip, RT3070) &&
+           (rt2x00_rf(&rt2x00dev->chip, RF2020) ||
+            rt2x00_rf(&rt2x00dev->chip, RF3020) ||
+            rt2x00_rf(&rt2x00dev->chip, RF3021) ||
+            rt2x00_rf(&rt2x00dev->chip, RF3022)))
                rt2800_config_channel_rt3x(rt2x00dev, conf, rf, info);
+       else
+               rt2800_config_channel_rt2x(rt2x00dev, conf, rf, info);
 
        /*
         * Change BBP settings