Commit 0a49b2c2 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: use bt handler for 2030 and 135 series devices



For bt combo devices, need to use bt enabled handlers and functions
Reported-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 909fc3cb
...@@ -168,6 +168,27 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -168,6 +168,27 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)
static struct iwl_lib_ops iwl2000_lib = { static struct iwl_lib_ops iwl2000_lib = {
.set_hw_params = iwl2000_hw_set_hw_params, .set_hw_params = iwl2000_hw_set_hw_params,
.rx_handler_setup = iwlagn_rx_handler_setup, .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, .setup_deferred_work = iwlagn_bt_setup_deferred_work,
.cancel_deferred_work = iwlagn_bt_cancel_deferred_work, .cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
...@@ -193,7 +214,7 @@ static const struct iwl_ops iwl2000_ops = { ...@@ -193,7 +214,7 @@ static const struct iwl_ops iwl2000_ops = {
}; };
static const struct iwl_ops iwl2030_ops = { static const struct iwl_ops iwl2030_ops = {
.lib = &iwl2000_lib, .lib = &iwl2030_lib,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
}; };
...@@ -203,7 +224,7 @@ static const struct iwl_ops iwl105_ops = { ...@@ -203,7 +224,7 @@ static const struct iwl_ops iwl105_ops = {
}; };
static const struct iwl_ops iwl135_ops = { static const struct iwl_ops iwl135_ops = {
.lib = &iwl2000_lib, .lib = &iwl2030_lib,
.utils = &iwlagn_hcmd_utils, .utils = &iwlagn_hcmd_utils,
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment