From: Gertjan van Wingerde <[email protected]>
(split off from the earlier RT35xx patch submitted by Shiang)
There's no point in enabling the PA_PE bits for the bands that we are
not active on.
Signed-off-by: Shiang Tu <[email protected]>
Signed-off-by: Gertjan van Wingerde <[email protected]>
Signed-off-by: Ivo van Doorn <[email protected]>
---
drivers/net/wireless/rt2x00/rt2800lib.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 93fb674..1cad89e 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1795,8 +1795,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
/* Turn on unused PA or LNA when not using 1T or 1R */
if (rt2x00dev->default_ant.tx_chain_num == 2) {
- rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN, 1);
- rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN, 1);
+ rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN,
+ rf->channel > 14);
+ rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN,
+ rf->channel <= 14);
}
/* Turn on unused PA or LNA when not using 1T or 1R */
--
1.7.2.3
Hi,
> On Thu, May 19, 2011 at 04:25, Ivo van Doorn <[email protected]> wrote:
>> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
>> index 93fb674..1cad89e 100644
>> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
>> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
>> @@ -1795,8 +1795,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
>>
>> ? ? ? ?/* Turn on unused PA or LNA when not using 1T or 1R */
>> ? ? ? ?if (rt2x00dev->default_ant.tx_chain_num == 2) {
>> - ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN, 1);
>> - ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN, 1);
>> + ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rf->channel > 14);
>> + ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rf->channel <= 14);
>
> Aren't there better ways to determine the band from the channel?
>
> I recall that there were some patches floating around relating to
> supporting Japanese channels (802.11j ?) which (IIRC) use channel 14
> in both bands - I'm not sure if this is applicable here, but would it
> not be better to get the actual band from mac/cfg80211 and switch
> based on that instead of on the channel number?
True, but we have to review this for the entire driver, we have several places
where we check the channel rather then the band. And even then we have
a FIXME somewhere (not sure who added it), which states that our registrations
of the bands are also possibly incorrect.
On the other hand, it also depends on the Ralink chips as well, I am not
even sure they support this channel 14 on both bands feature.
Ivo
Gertjan, Ivo,
Minor nit
On Thu, May 19, 2011 at 04:25, Ivo van Doorn <[email protected]> wrote:
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index 93fb674..1cad89e 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -1795,8 +1795,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
>
> ? ? ? ?/* Turn on unused PA or LNA when not using 1T or 1R */
> ? ? ? ?if (rt2x00dev->default_ant.tx_chain_num == 2) {
> - ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN, 1);
> - ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN, 1);
> + ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rf->channel > 14);
> + ? ? ? ? ? ? ? rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rf->channel <= 14);
Aren't there better ways to determine the band from the channel?
I recall that there were some patches floating around relating to
supporting Japanese channels (802.11j ?) which (IIRC) use channel 14
in both bands - I'm not sure if this is applicable here, but would it
not be better to get the actual band from mac/cfg80211 and switch
based on that instead of on the channel number?
Thanks,
--
Julian Calaby
Email: [email protected]
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/