---

yaml --- r: 265854 b: refs/heads/master c: fee84f0 h: refs/heads/master v: v3
git-mirror · Aug 29, 2011 · a0e04b7 · a0e04b7
1 parent 8b86bd0
commit a0e04b7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a9ae0dc1d4ed6a2007aea14e41d9ba0ae1e3fd4
+refs/heads/master: fee84f0dc45f40eabbddf619d5ec18d456c5185a
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -610,7 +610,7 @@ struct iwl_mod_params iwlagn_mod_params = {
 	.bt_coex_active = true,
 	.no_sleep_autoadjust = true,
 	.power_level = IWL_POWER_INDEX_1,
-	.bt_ch_announce = 1,
+	.bt_ch_announce = true,
 	.wanted_ucode_alternative = 1,
 	.auto_agg = true,
 	/* the rest are 0 by default */

diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3542,7 +3542,7 @@ MODULE_PARM_DESC(antenna_coupling,
 module_param_named(bt_ch_inhibition, iwlagn_mod_params.bt_ch_announce,
 		   bool, S_IRUGO);
 MODULE_PARM_DESC(bt_ch_inhibition,
-		 "Disable BT channel inhibition (default: enable)");
+		 "Enable BT channel inhibition (default: enable)");
 
 module_param_named(plcp_check, iwlagn_mod_params.plcp_check, bool, S_IRUGO);
 MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");

diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -91,7 +91,7 @@ struct iwl_mod_params {
 	int power_level;	/* def: 1 = power level */
 	u32 debug_level;	/* levels are IWL_DL_* */
 	int ant_coupling;
-	bool bt_ch_announce;
+	bool bt_ch_announce;	/* def: enable = BT channel inhibition */
 	int wanted_ucode_alternative;
 	bool auto_agg;		/* def: true = enable agg. without check */
 };