Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46323e11 authored Aug 23, 2010 by Ivo van Doorn Committed by John W. Linville Aug 25, 2010

rt2x00: Fix channel configuration for RF3052



We missed a check for RF3052 in the config_channel
configuration function. As a result the channel is not
properly configured for RF3052 devices. This also
requires rt2800_config_channel_rf3xxx to support 5GHz
channels, so we must apply the TXPOWER_A_TO_DEV and
TXPOWER_G_TO_DEV conversions during rt2800_config_channel()

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent b9a07ae9

drivers/net/wireless/rt2x00/rt2800lib.c

+16 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1244,8 +1244,7 @@ static void rt2800_config_channel_rf2xxx(struct rt2x00_dev *rt2x00dev,
	if (info->tx_power1 < 0)		if (info->tx_power1 < 0)
	info->tx_power1 += 7;		info->tx_power1 += 7;

	rt2x00_set_field32(&rf->rf3, RF3_TXPOWER_A,		rt2x00_set_field32(&rf->rf3, RF3_TXPOWER_A, info->tx_power1);
	TXPOWER_A_TO_DEV(info->tx_power1));

	rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_A_7DBM_BOOST,		rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_A_7DBM_BOOST,
	(info->tx_power2 >= 0));		(info->tx_power2 >= 0));
	@@ -1253,13 +1252,10 @@ static void rt2800_config_channel_rf2xxx(struct rt2x00_dev *rt2x00dev,
	if (info->tx_power2 < 0)		if (info->tx_power2 < 0)
	info->tx_power2 += 7;		info->tx_power2 += 7;

	rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_A,		rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_A, info->tx_power2);
	TXPOWER_A_TO_DEV(info->tx_power2));
	} else {		} else {
	rt2x00_set_field32(&rf->rf3, RF3_TXPOWER_G,		rt2x00_set_field32(&rf->rf3, RF3_TXPOWER_G, info->tx_power1);
	TXPOWER_G_TO_DEV(info->tx_power1));		rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_G, info->tx_power2);
	rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_G,
	TXPOWER_G_TO_DEV(info->tx_power2));
	}		}

	rt2x00_set_field32(&rf->rf4, RF4_HT40, conf_is_ht40(conf));		rt2x00_set_field32(&rf->rf4, RF4_HT40, conf_is_ht40(conf));
	@@ -1299,13 +1295,11 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev,
	rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);		rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);

	rt2800_rfcsr_read(rt2x00dev, 12, &rfcsr);		rt2800_rfcsr_read(rt2x00dev, 12, &rfcsr);
	rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER,		rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER, info->tx_power1);
	TXPOWER_G_TO_DEV(info->tx_power1));
	rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);		rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);

	rt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);		rt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);
	rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER,		rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER, info->tx_power2);
	TXPOWER_G_TO_DEV(info->tx_power2));
	rt2800_rfcsr_write(rt2x00dev, 13, rfcsr);		rt2800_rfcsr_write(rt2x00dev, 13, rfcsr);

	rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);		rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);
	@@ -1329,10 +1323,19 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
	unsigned int tx_pin;		unsigned int tx_pin;
	u8 bbp;		u8 bbp;

			if (rf->channel <= 14) {
			info->tx_power1 = TXPOWER_G_TO_DEV(info->tx_power1);
			info->tx_power2 = TXPOWER_G_TO_DEV(info->tx_power2);
			} else {
			info->tx_power1 = TXPOWER_A_TO_DEV(info->tx_power1);
			info->tx_power2 = TXPOWER_A_TO_DEV(info->tx_power2);
			}

	if (rt2x00_rf(rt2x00dev, RF2020) \|\|		if (rt2x00_rf(rt2x00dev, RF2020) \|\|
	rt2x00_rf(rt2x00dev, RF3020) \|\|		rt2x00_rf(rt2x00dev, RF3020) \|\|
	rt2x00_rf(rt2x00dev, RF3021) \|\|		rt2x00_rf(rt2x00dev, RF3021) \|\|
	rt2x00_rf(rt2x00dev, RF3022))		rt2x00_rf(rt2x00dev, RF3022) \|\|
			rt2x00_rf(rt2x00dev, RF3052))
	rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);		rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);
	else		else
	rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);