On Mon, Feb 6, 2012 at 11:45 PM, Gertjan van Wingerde <gwingerde@xxxxxxxxx> wrote: > Align with v2.5.0.0 Ralink RT3572 driver for 2.4GHz band channel switch. > > Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx> > Acked-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx> Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx> > diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c > index cb841f4..66af6f4 100644 > --- a/drivers/net/wireless/rt2x00/rt2800lib.c > +++ b/drivers/net/wireless/rt2x00/rt2800lib.c > @@ -1783,8 +1783,7 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev, > if (rf->channel <= 14) { > rt2x00_set_field8(&rfcsr, RFCSR12_DR0, 3); > rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER, > - (info->default_power1 & 0x3) | > - ((info->default_power1 & 0xC) << 1)); > + info->default_power1); > } else { > rt2x00_set_field8(&rfcsr, RFCSR12_DR0, 7); > rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER, > @@ -1797,8 +1796,7 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev, > if (rf->channel <= 14) { > rt2x00_set_field8(&rfcsr, RFCSR13_DR0, 3); > rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER, > - (info->default_power2 & 0x3) | > - ((info->default_power2 & 0xC) << 1)); > + info->default_power2); > } else { > rt2x00_set_field8(&rfcsr, RFCSR13_DR0, 7); > rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER, > -- > 1.7.9 > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html