summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-02-06 11:29:42 -0800
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-02-11 11:51:57 -0800
commitcaebbb7a4ac3e31b259954b757b15b8f0ac708d5 (patch)
treee791d476d9dd9377413ee8d93df8942b0e05173f /drivers/net
parentc4197c6298750d308fc819c0525902f49ab920fb (diff)
downloadop-kernel-dev-caebbb7a4ac3e31b259954b757b15b8f0ac708d5.zip
op-kernel-dev-caebbb7a4ac3e31b259954b757b15b8f0ac708d5.tar.gz
iwlagn: handle bt defer work in 2000 series
For 2000 series, need to handle bt traffic changes when receive notification from uCode Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-2000.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 3c5dd36..30483e2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -265,7 +265,8 @@ static struct iwl_lib_ops iwl2000_lib = {
.txq_free_tfd = iwl_hw_txq_free_tfd,
.txq_init = iwl_hw_tx_queue_init,
.rx_handler_setup = iwlagn_rx_handler_setup,
- .setup_deferred_work = iwlagn_setup_deferred_work,
+ .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,
.load_ucode = iwlagn_load_ucode,
.dump_nic_event_log = iwl_dump_nic_event_log,
OpenPOWER on IntegriCloud