]> Pileus Git - ~andy/linux/commitdiff
rt2x00: rt2800 - Fix default vgc values for RT3572
authorGertjan van Wingerde <gwingerde@gmail.com>
Sun, 16 Sep 2012 20:29:50 +0000 (22:29 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Sep 2012 18:59:12 +0000 (14:59 -0400)
Align with the values used by the RT3572 Ralink vendor driver v2.5.0.0.

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>
drivers/net/wireless/rt2x00/rt2800lib.c

index cec4a992374e797e964a1412b7f0cf72a5352c24..17b8a281094f6bb405a52c945b7816188061d071 100644 (file)
@@ -2904,16 +2904,21 @@ static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev)
                    rt2x00_rt(rt2x00dev, RT3090) ||
                    rt2x00_rt(rt2x00dev, RT3290) ||
                    rt2x00_rt(rt2x00dev, RT3390) ||
+                   rt2x00_rt(rt2x00dev, RT3572) ||
                    rt2x00_rt(rt2x00dev, RT5390) ||
                    rt2x00_rt(rt2x00dev, RT5392))
                        vgc = 0x1c + (2 * rt2x00dev->lna_gain);
                else
                        vgc = 0x2e + rt2x00dev->lna_gain;
        } else { /* 5GHZ band */
-               if (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
-                       vgc = 0x32 + (rt2x00dev->lna_gain * 5) / 3;
-               else
-                       vgc = 0x3a + (rt2x00dev->lna_gain * 5) / 3;
+               if (rt2x00_rt(rt2x00dev, RT3572))
+                       vgc = 0x22 + (rt2x00dev->lna_gain * 5) / 3;
+               else {
+                       if (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
+                               vgc = 0x32 + (rt2x00dev->lna_gain * 5) / 3;
+                       else
+                               vgc = 0x3a + (rt2x00dev->lna_gain * 5) / 3;
+               }
        }
 
        return vgc;