diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-01-22 17:22:50 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-25 16:36:23 -0500 |
commit | dab1c161fed18eb6b3472bdbfd827264caae097f (patch) | |
tree | a44a6e0b47136527a74c872587d129087270cccb | |
parent | 3459ab5a1c92eaf8b76e9fa1b6ca529cf83066f3 (diff) |
iwlwifi: bit field description for BT Config command
Give better bit filed define and description for flag parameter
in REPLY_BT_CONFIG command:
flags:
bit 0 - 1: BT channel announcement enabled
0: disable
bit 1 - 1: priority of BT device enabled
0: disable
bit 2 - 1: BT 2 wire support enabled
0: disable
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.h | 15 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 8823d18b9f43..ce538946f3ff 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
@@ -2247,10 +2247,19 @@ struct iwl_link_quality_cmd { | |||
2247 | __le32 reserved2; | 2247 | __le32 reserved2; |
2248 | } __attribute__ ((packed)); | 2248 | } __attribute__ ((packed)); |
2249 | 2249 | ||
2250 | /* | ||
2251 | * BT configuration enable flags: | ||
2252 | * bit 0 - 1: BT channel announcement enabled | ||
2253 | * 0: disable | ||
2254 | * bit 1 - 1: priority of BT device enabled | ||
2255 | * 0: disable | ||
2256 | * bit 2 - 1: BT 2 wire support enabled | ||
2257 | * 0: disable | ||
2258 | */ | ||
2250 | #define BT_COEX_DISABLE (0x0) | 2259 | #define BT_COEX_DISABLE (0x0) |
2251 | #define BT_COEX_MODE_2W (0x1) | 2260 | #define BT_ENABLE_CHANNEL_ANNOUNCE BIT(0) |
2252 | #define BT_COEX_MODE_3W (0x2) | 2261 | #define BT_ENABLE_PRIORITY BIT(1) |
2253 | #define BT_COEX_MODE_4W (0x3) | 2262 | #define BT_ENABLE_2_WIRE BIT(2) |
2254 | 2263 | ||
2255 | #define BT_LEAD_TIME_MIN (0x0) | 2264 | #define BT_LEAD_TIME_MIN (0x0) |
2256 | #define BT_LEAD_TIME_DEF (0x1E) | 2265 | #define BT_LEAD_TIME_DEF (0x1E) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 645bc133577a..d625aa8fe7a2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1977,7 +1977,7 @@ EXPORT_SYMBOL(iwl_isr_legacy); | |||
1977 | int iwl_send_bt_config(struct iwl_priv *priv) | 1977 | int iwl_send_bt_config(struct iwl_priv *priv) |
1978 | { | 1978 | { |
1979 | struct iwl_bt_cmd bt_cmd = { | 1979 | struct iwl_bt_cmd bt_cmd = { |
1980 | .flags = BT_COEX_MODE_4W, | 1980 | .flags = BT_ENABLE_CHANNEL_ANNOUNCE | BT_ENABLE_PRIORITY, |
1981 | .lead_time = BT_LEAD_TIME_DEF, | 1981 | .lead_time = BT_LEAD_TIME_DEF, |
1982 | .max_kill = BT_MAX_KILL_DEF, | 1982 | .max_kill = BT_MAX_KILL_DEF, |
1983 | .kill_ack_mask = 0, | 1983 | .kill_ack_mask = 0, |