diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/3945.c | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c index 6c1ae5fab899..66a5dc072eb2 100644 --- a/drivers/net/wireless/iwlegacy/3945.c +++ b/drivers/net/wireless/iwlegacy/3945.c | |||
| @@ -2646,18 +2646,9 @@ static struct il_lib_ops il3945_lib = { | |||
| 2646 | .config = il3945_nic_config, | 2646 | .config = il3945_nic_config, |
| 2647 | }, | 2647 | }, |
| 2648 | .eeprom_ops = { | 2648 | .eeprom_ops = { |
| 2649 | .regulatory_bands = { | 2649 | .acquire_semaphore = il3945_eeprom_acquire_semaphore, |
| 2650 | EEPROM_REGULATORY_BAND_1_CHANNELS, | 2650 | .release_semaphore = il3945_eeprom_release_semaphore, |
| 2651 | EEPROM_REGULATORY_BAND_2_CHANNELS, | 2651 | }, |
| 2652 | EEPROM_REGULATORY_BAND_3_CHANNELS, | ||
| 2653 | EEPROM_REGULATORY_BAND_4_CHANNELS, | ||
| 2654 | EEPROM_REGULATORY_BAND_5_CHANNELS, | ||
| 2655 | EEPROM_REGULATORY_BAND_NO_HT40, | ||
| 2656 | EEPROM_REGULATORY_BAND_NO_HT40, | ||
| 2657 | }, | ||
| 2658 | .acquire_semaphore = il3945_eeprom_acquire_semaphore, | ||
| 2659 | .release_semaphore = il3945_eeprom_release_semaphore, | ||
| 2660 | }, | ||
| 2661 | .send_tx_power = il3945_send_tx_power, | 2652 | .send_tx_power = il3945_send_tx_power, |
| 2662 | .is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr, | 2653 | .is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr, |
| 2663 | 2654 | ||
| @@ -2707,7 +2698,17 @@ static struct il_cfg il3945_bg_cfg = { | |||
| 2707 | .set_l0s = false, | 2698 | .set_l0s = false, |
| 2708 | .use_bsm = true, | 2699 | .use_bsm = true, |
| 2709 | .led_compensation = 64, | 2700 | .led_compensation = 64, |
| 2710 | .wd_timeout = IL_DEF_WD_TIMEOUT | 2701 | .wd_timeout = IL_DEF_WD_TIMEOUT, |
| 2702 | |||
| 2703 | .regulatory_bands = { | ||
| 2704 | EEPROM_REGULATORY_BAND_1_CHANNELS, | ||
| 2705 | EEPROM_REGULATORY_BAND_2_CHANNELS, | ||
| 2706 | EEPROM_REGULATORY_BAND_3_CHANNELS, | ||
| 2707 | EEPROM_REGULATORY_BAND_4_CHANNELS, | ||
| 2708 | EEPROM_REGULATORY_BAND_5_CHANNELS, | ||
| 2709 | EEPROM_REGULATORY_BAND_NO_HT40, | ||
| 2710 | EEPROM_REGULATORY_BAND_NO_HT40, | ||
| 2711 | }, | ||
| 2711 | }; | 2712 | }; |
| 2712 | 2713 | ||
| 2713 | static struct il_cfg il3945_abg_cfg = { | 2714 | static struct il_cfg il3945_abg_cfg = { |
| @@ -2726,7 +2727,17 @@ static struct il_cfg il3945_abg_cfg = { | |||
| 2726 | .set_l0s = false, | 2727 | .set_l0s = false, |
| 2727 | .use_bsm = true, | 2728 | .use_bsm = true, |
| 2728 | .led_compensation = 64, | 2729 | .led_compensation = 64, |
| 2729 | .wd_timeout = IL_DEF_WD_TIMEOUT | 2730 | .wd_timeout = IL_DEF_WD_TIMEOUT, |
| 2731 | |||
| 2732 | .regulatory_bands = { | ||
| 2733 | EEPROM_REGULATORY_BAND_1_CHANNELS, | ||
| 2734 | EEPROM_REGULATORY_BAND_2_CHANNELS, | ||
| 2735 | EEPROM_REGULATORY_BAND_3_CHANNELS, | ||
| 2736 | EEPROM_REGULATORY_BAND_4_CHANNELS, | ||
| 2737 | EEPROM_REGULATORY_BAND_5_CHANNELS, | ||
| 2738 | EEPROM_REGULATORY_BAND_NO_HT40, | ||
| 2739 | EEPROM_REGULATORY_BAND_NO_HT40, | ||
| 2740 | }, | ||
| 2730 | }; | 2741 | }; |
| 2731 | 2742 | ||
| 2732 | DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = { | 2743 | DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = { |