aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/4965.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-02-13 05:23:12 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-22 14:51:12 -0500
commit93a984a4eec83f45abddb80724da7dcb85b4db6b (patch)
treed84226c714da884a659f02d5c3bab214db8f5f34 /drivers/net/wireless/iwlegacy/4965.c
parenta5f16137ab8aff1208d3ea013033d0d38f15a61f (diff)
iwlegacy: regulatory_bands is not an ops
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965.c')
-rw-r--r--drivers/net/wireless/iwlegacy/4965.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index 79e4e7971338..aea84bf4e935 100644
--- a/drivers/net/wireless/iwlegacy/4965.c
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -2217,14 +2217,6 @@ static struct il_lib_ops il4965_lib = {
2217 .config = il4965_nic_config, 2217 .config = il4965_nic_config,
2218 }, 2218 },
2219 .eeprom_ops = { 2219 .eeprom_ops = {
2220 .regulatory_bands = {
2221 EEPROM_REGULATORY_BAND_1_CHANNELS,
2222 EEPROM_REGULATORY_BAND_2_CHANNELS,
2223 EEPROM_REGULATORY_BAND_3_CHANNELS,
2224 EEPROM_REGULATORY_BAND_4_CHANNELS,
2225 EEPROM_REGULATORY_BAND_5_CHANNELS,
2226 EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,
2227 EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS},
2228 .acquire_semaphore = il4965_eeprom_acquire_semaphore, 2220 .acquire_semaphore = il4965_eeprom_acquire_semaphore,
2229 .release_semaphore = il4965_eeprom_release_semaphore, 2221 .release_semaphore = il4965_eeprom_release_semaphore,
2230 }, 2222 },
@@ -2288,6 +2280,17 @@ struct il_cfg il4965_cfg = {
2288 .ucode_tracing = true, 2280 .ucode_tracing = true,
2289 .sensitivity_calib_by_driver = true, 2281 .sensitivity_calib_by_driver = true,
2290 .chain_noise_calib_by_driver = true, 2282 .chain_noise_calib_by_driver = true,
2283
2284 .regulatory_bands = {
2285 EEPROM_REGULATORY_BAND_1_CHANNELS,
2286 EEPROM_REGULATORY_BAND_2_CHANNELS,
2287 EEPROM_REGULATORY_BAND_3_CHANNELS,
2288 EEPROM_REGULATORY_BAND_4_CHANNELS,
2289 EEPROM_REGULATORY_BAND_5_CHANNELS,
2290 EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,
2291 EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS
2292 },
2293
2291}; 2294};
2292 2295
2293/* Module firmware */ 2296/* Module firmware */