diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-28 13:18:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-28 13:18:21 -0400 |
| commit | 57ed5cd695d7373b8ae0ae9f10fe945e774d58f0 (patch) | |
| tree | 7ee6244ea7c0be81a541d4e57783f83c4dfd7d66 /drivers/net/wireless/rt2x00/rt61pci.c | |
| parent | 5e6700b3bf98fe98d630bf9c939ad4c85ce95592 (diff) | |
| parent | 0f817ed52d07873cd39c9d3f6d87fae962dc742f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/wireless/nl80211.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 53754bc66d05..54d3ddfc9888 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
| @@ -2825,7 +2825,8 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
| 2825 | tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START); | 2825 | tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START); |
| 2826 | for (i = 14; i < spec->num_channels; i++) { | 2826 | for (i = 14; i < spec->num_channels; i++) { |
| 2827 | info[i].max_power = MAX_TXPOWER; | 2827 | info[i].max_power = MAX_TXPOWER; |
| 2828 | info[i].default_power1 = TXPOWER_FROM_DEV(tx_power[i]); | 2828 | info[i].default_power1 = |
| 2829 | TXPOWER_FROM_DEV(tx_power[i - 14]); | ||
| 2829 | } | 2830 | } |
| 2830 | } | 2831 | } |
| 2831 | 2832 | ||