aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-6000.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-11-23 10:58:54 -0800
committerJohn W. Linville <linville@tuxdriver.com>2010-11-24 16:19:37 -0500
commite366176e5c7f37d2d4cd0708e63b939e3fa3b5c6 (patch)
treeaa4863dc9e96d6590710d03d4a09c6c11d421af2 /drivers/net/wireless/iwlwifi/iwl-6000.c
parentiwlwifi: add more power management flags (diff)
downloadlinux-dev-e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6.tar.xz
linux-dev-e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6.zip
iwlwifi: consider BT for power management
Check the BT PSPoll flag when fill PM command to uCode 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/iwl-6000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 0cc66fdc7a0d..f650282a3ad3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -549,6 +549,7 @@ static struct iwl_bt_params iwl6000_bt_params = {
.agg_time_limit = BT_AGG_THRESHOLD_DEF,
.bt_init_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_NONE,
.bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT,
+ .bt_sco_disable = true,
};
struct iwl_cfg iwl6000g2a_2agn_cfg = {