aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2009-10-23 16:42:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:49:59 -0400
commit456d0f76727ba6f97aa1cee63f1bae84642768c4 (patch)
tree8bbdb47ef8e559e34ab07797f8d8916ed7fed63d
parent1ed2a3d29ac304092f588a47a9ed2b83d4d8c835 (diff)
iwlwifi: update bt co-exit configuration parameter
Adding parameter ranges for bt co-exist configuration command. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-commands.h13
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c6
2 files changed, 16 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 1a7c0d02c19c..0d660a7475a0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2218,6 +2218,19 @@ struct iwl_link_quality_cmd {
2218 __le32 reserved2; 2218 __le32 reserved2;
2219} __attribute__ ((packed)); 2219} __attribute__ ((packed));
2220 2220
2221#define BT_COEX_DISABLE (0x0)
2222#define BT_COEX_MODE_2W (0x1)
2223#define BT_COEX_MODE_3W (0x2)
2224#define BT_COEX_MODE_4W (0x3)
2225
2226#define BT_LEAD_TIME_MIN (0x0)
2227#define BT_LEAD_TIME_DEF (0x1E)
2228#define BT_LEAD_TIME_MAX (0xFF)
2229
2230#define BT_MAX_KILL_MIN (0x1)
2231#define BT_MAX_KILL_DEF (0x5)
2232#define BT_MAX_KILL_MAX (0xFF)
2233
2221/* 2234/*
2222 * REPLY_BT_CONFIG = 0x9b (command, has simple generic response) 2235 * REPLY_BT_CONFIG = 0x9b (command, has simple generic response)
2223 * 2236 *
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 1d7248cd1969..77b9825f79ba 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2003,9 +2003,9 @@ EXPORT_SYMBOL(iwl_isr_legacy);
2003int iwl_send_bt_config(struct iwl_priv *priv) 2003int iwl_send_bt_config(struct iwl_priv *priv)
2004{ 2004{
2005 struct iwl_bt_cmd bt_cmd = { 2005 struct iwl_bt_cmd bt_cmd = {
2006 .flags = 3, 2006 .flags = BT_COEX_MODE_4W,
2007 .lead_time = 0xAA, 2007 .lead_time = BT_LEAD_TIME_DEF,
2008 .max_kill = 1, 2008 .max_kill = BT_MAX_KILL_DEF,
2009 .kill_ack_mask = 0, 2009 .kill_ack_mask = 0,
2010 .kill_cts_mask = 0, 2010 .kill_cts_mask = 0,
2011 }; 2011 };