Skip to contentSkip to conversation

rt2x00: rt2800: use tx_power2 in rt2800_config_channel_rf3xxx

PATCH In review Helmut Schaa 3 participants 3 messages Apr 23, 2010 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rt2x00: rt2800: use tx_power2 in rt2800_config_channel_rf3xxx

Get closer to what the ralink driver does by setting the rf register 13 to tx_power2 during channel switch.

---

Just found that difference between rt2x00 and the ralink driver. However I couldn't see any obvious improvements. So, this change is mostly for completeness.

 drivers/net/wireless/rt2x00/rt2800.h    |    5 +++++
 drivers/net/wireless/rt2x00/rt2800lib.c |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2800.h +5 -0
index ec89372..1c59dc6 100644
@@ -1566,6 +1566,11 @@ struct mac_iveiv_entry {
 #define RFCSR12_TX_POWER		FIELD8(0x1f)
 
 /*
+ * RFCSR 13:
+ */
+#define RFCSR13_TX_POWER		FIELD8(0x1f)
+
+/*
  * RFCSR 15:
  */
 #define RFCSR15_TX_LO2_EN		FIELD8(0x08)
drivers/net/wireless/rt2x00/rt2800lib.c +5 -0
index aa02ff6..3ee9882 100644
@@ -794,6 +794,11 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev,
 			  TXPOWER_G_TO_DEV(info->tx_power1));
 	rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);
 
+	rt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);
+	rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER,
+			  TXPOWER_G_TO_DEV(info->tx_power2));
+	rt2800_rfcsr_write(rt2x00dev, 13, rfcsr);
+
 	rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);
 	rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset);
 	rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);
Signature · 1 line
1.6.4.2
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Helmut Schaa

Get closer to what the ralink driver does by setting the rf register 13 to tx_power2 during channel switch.

Good catch.

Quoted 42 lines

---

Just found that difference between rt2x00 and the ralink driver. However I couldn't see any obvious improvements. So, this change is mostly for completeness.

 drivers/net/wireless/rt2x00/rt2800.h    |    5 +++++
 drivers/net/wireless/rt2x00/rt2800lib.c |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2800.h +5 -0
index ec89372..1c59dc6 100644
@@ -1566,6 +1566,11 @@ struct mac_iveiv_entry {
 #define RFCSR12_TX_POWER		FIELD8(0x1f)
 
 /*
+ * RFCSR 13:
+ */
+#define RFCSR13_TX_POWER		FIELD8(0x1f)
+
+/*
  * RFCSR 15:
  */
 #define RFCSR15_TX_LO2_EN		FIELD8(0x08)
drivers/net/wireless/rt2x00/rt2800lib.c +5 -0
index aa02ff6..3ee9882 100644
@@ -794,6 +794,11 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev,
 			  TXPOWER_G_TO_DEV(info->tx_power1));
 	rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);
 
+	rt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);
+	rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER,
+			  TXPOWER_G_TO_DEV(info->tx_power2));
+	rt2800_rfcsr_write(rt2x00dev, 13, rfcsr);
+
 	rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);
 	rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset);
 	rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);