diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-11-23 13:58:54 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-24 16:19:37 -0500 |
commit | e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6 (patch) | |
tree | aa4863dc9e96d6590710d03d4a09c6c11d421af2 /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
parent | 97badb0eefc9b6f23f864c5348b695be35f05882 (diff) |
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-agn-lib.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index c4491f7641fe..f8fe5f44e19f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -1829,6 +1829,10 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) | |||
1829 | } else { | 1829 | } else { |
1830 | bt_cmd.flags = IWLAGN_BT_FLAG_COEX_MODE_3W << | 1830 | bt_cmd.flags = IWLAGN_BT_FLAG_COEX_MODE_3W << |
1831 | IWLAGN_BT_FLAG_COEX_MODE_SHIFT; | 1831 | IWLAGN_BT_FLAG_COEX_MODE_SHIFT; |
1832 | if (priv->cfg->bt_params && | ||
1833 | priv->cfg->bt_params->bt_sco_disable) | ||
1834 | bt_cmd.flags |= IWLAGN_BT_FLAG_SYNC_2_BT_DISABLE; | ||
1835 | |||
1832 | if (priv->bt_ch_announce) | 1836 | if (priv->bt_ch_announce) |
1833 | bt_cmd.flags |= IWLAGN_BT_FLAG_CHANNEL_INHIBITION; | 1837 | bt_cmd.flags |= IWLAGN_BT_FLAG_CHANNEL_INHIBITION; |
1834 | IWL_DEBUG_INFO(priv, "BT coex flag: 0X%x\n", bt_cmd.flags); | 1838 | IWL_DEBUG_INFO(priv, "BT coex flag: 0X%x\n", bt_cmd.flags); |