diff options
| author | Rafał Miłecki | 2013-03-17 19:49:08 +0100 |
|---|---|---|
| committer | Rafał Miłecki | 2013-04-23 12:27:56 +0200 |
| commit | 418e8b680516d3ff7f27a0094fe461cfc8a3e3c4 (patch) | |
| tree | f65092c36c63f88f3bdf0bfec56fce91a1e89156 /drivers/net/wireless/b43 | |
| parent | b43: HT-PHY: define regs for power estimation (diff) | |
| download | kernel-qcow2-linux-418e8b680516d3ff7f27a0094fe461cfc8a3e3c4.tar.gz kernel-qcow2-linux-418e8b680516d3ff7f27a0094fe461cfc8a3e3c4.tar.xz kernel-qcow2-linux-418e8b680516d3ff7f27a0094fe461cfc8a3e3c4.zip | |
b43: HT-PHY: store TX power state before disabling it
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/phy_ht.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c index 1caeedc8f686..355651a1099e 100644 --- a/drivers/net/wireless/b43/phy_ht.c +++ b/drivers/net/wireless/b43/phy_ht.c @@ -497,15 +497,17 @@ static void b43_phy_ht_tx_power_ctl(struct b43_wldev *dev, bool enable) static const u16 cmd_regs[3] = { B43_PHY_HT_TXPCTL_CMD_C1, B43_PHY_HT_TXPCTL_CMD_C2, B43_PHY_HT_TXPCTL_CMD_C3 }; + static const u16 status_regs[3] = { B43_PHY_HT_TX_PCTL_STATUS_C1, + B43_PHY_HT_TX_PCTL_STATUS_C2, + B43_PHY_HT_TX_PCTL_STATUS_C3 }; int i; if (!enable) { if (b43_phy_read(dev, B43_PHY_HT_TXPCTL_CMD_C1) & en_bits) { /* We disable enabled TX pwr ctl, save it's state */ - /* - * TODO: find the registers. On N-PHY they were 0x1ed - * and 0x1ee, we need 3 such a registers for HT-PHY - */ + for (i = 0; i < 3; i++) + phy_ht->tx_pwr_idx[i] = + b43_phy_read(dev, status_regs[i]); } b43_phy_mask(dev, B43_PHY_HT_TXPCTL_CMD_C1, ~en_bits); } else { |