diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-08 08:46:21 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-11 15:02:06 -0400 |
| commit | 0a49b2c2a6bf2f774675e472afe68951900596fb (patch) | |
| tree | 504838c20be456539934c87ad9500be5e4085793 /drivers/net/wireless/iwlwifi | |
| parent | 909fc3cba374560ada33a7dc3ab242d0f1d2a135 (diff) | |
iwlagn: use bt handler for 2030 and 135 series devices
For bt combo devices, need to use bt enabled handlers and functions
Reported-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-2000.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index b2b054f6cd69..21b68b2839c9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c @@ -168,6 +168,27 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) static struct iwl_lib_ops iwl2000_lib = { .set_hw_params = iwl2000_hw_set_hw_params, .rx_handler_setup = iwlagn_rx_handler_setup, + .setup_deferred_work = iwlagn_setup_deferred_work, + .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, + .nic_config = iwl2000_nic_config, + .eeprom_ops = { + .regulatory_bands = { + EEPROM_REG_BAND_1_CHANNELS, + EEPROM_REG_BAND_2_CHANNELS, + EEPROM_REG_BAND_3_CHANNELS, + EEPROM_REG_BAND_4_CHANNELS, + EEPROM_REG_BAND_5_CHANNELS, + EEPROM_6000_REG_BAND_24_HT40_CHANNELS, + EEPROM_REGULATORY_BAND_NO_HT40, + }, + .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, + }, + .temperature = iwlagn_temperature, +}; + +static struct iwl_lib_ops iwl2030_lib = { + .set_hw_params = iwl2000_hw_set_hw_params, + .rx_handler_setup = iwlagn_bt_rx_handler_setup, .setup_deferred_work = iwlagn_bt_setup_deferred_work, .cancel_deferred_work = iwlagn_bt_cancel_deferred_work, .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, @@ -193,7 +214,7 @@ static const struct iwl_ops iwl2000_ops = { }; static const struct iwl_ops iwl2030_ops = { - .lib = &iwl2000_lib, + .lib = &iwl2030_lib, .utils = &iwlagn_hcmd_utils, }; @@ -203,7 +224,7 @@ static const struct iwl_ops iwl105_ops = { }; static const struct iwl_ops iwl135_ops = { - .lib = &iwl2000_lib, + .lib = &iwl2030_lib, .utils = &iwlagn_hcmd_utils, }; |