aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/phy.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-08-17 21:07:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 11:36:03 -0400
commit608b88cb34b0e70a538ee1fc334cc833ef691836 (patch)
tree6d2a363cea722241581306964da6cff8724b407a /drivers/net/wireless/ath/ath5k/phy.c
parent4c48381786159ba3f3d8a33d967aeb049341a220 (diff)
ath: move regulatory info into shared common structure
This moves the shared regulatory structure into the common structure. We will use this ongoing for common data. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/phy.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/phy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 298fcf015227..1a039f2bd732 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -2198,6 +2198,7 @@ static void
2198ath5k_get_max_ctl_power(struct ath5k_hw *ah, 2198ath5k_get_max_ctl_power(struct ath5k_hw *ah,
2199 struct ieee80211_channel *channel) 2199 struct ieee80211_channel *channel)
2200{ 2200{
2201 struct ath_regulatory *regulatory = ath5k_hw_regulatory(ah);
2201 struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom; 2202 struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
2202 struct ath5k_edge_power *rep = ee->ee_ctl_pwr; 2203 struct ath5k_edge_power *rep = ee->ee_ctl_pwr;
2203 u8 *ctl_val = ee->ee_ctl; 2204 u8 *ctl_val = ee->ee_ctl;
@@ -2208,7 +2209,7 @@ ath5k_get_max_ctl_power(struct ath5k_hw *ah,
2208 u8 ctl_idx = 0xFF; 2209 u8 ctl_idx = 0xFF;
2209 u32 target = channel->center_freq; 2210 u32 target = channel->center_freq;
2210 2211
2211 ctl_mode = ath_regd_get_band_ctl(&ah->ah_regulatory, channel->band); 2212 ctl_mode = ath_regd_get_band_ctl(regulatory, channel->band);
2212 2213
2213 switch (channel->hw_value & CHANNEL_MODES) { 2214 switch (channel->hw_value & CHANNEL_MODES) {
2214 case CHANNEL_A: 2215 case CHANNEL_A: