aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-11-26 16:24:19 -0500
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-12-02 11:35:34 -0500
commit9f28ebc381ca00af0f9033a29776775068344b06 (patch)
treedf919e7629eed0072d47ee5ba1c5a623992f5555
parentadb90a00371a9a06a55c7b7ed7b38152f8e960c3 (diff)
iwlagn: name change for bt_ch_announce module parameter
Change the module parameter name to bt_ch_inhibition from bt_ch_announce to better describe the functionality In order to allow Bluetooth to activate a smart AFH mechanism and to maximize its available bandwidth the WiFi will request BT Core to inhibit its activity in channels that interfere with WiFi activity (and vice versa) if bt_ch_inhibition is enabled Set module parameter "bt_ch_inhibition=0" will disable the channel inhibition function Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 9a6f7a03be88..32ab4a0215a0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2502,7 +2502,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
2502 return pos; 2502 return pos;
2503 } 2503 }
2504 2504
2505 /* enable/disable bt channel announcement */ 2505 /* enable/disable bt channel inhibition */
2506 priv->bt_ch_announce = iwlagn_bt_ch_announce; 2506 priv->bt_ch_announce = iwlagn_bt_ch_announce;
2507 2507
2508#ifdef CONFIG_IWLWIFI_DEBUG 2508#ifdef CONFIG_IWLWIFI_DEBUG
@@ -4044,8 +4044,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
4044 (iwlagn_ant_coupling > IWL_BT_ANTENNA_COUPLING_THRESHOLD) ? 4044 (iwlagn_ant_coupling > IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?
4045 true : false; 4045 true : false;
4046 4046
4047 /* enable/disable bt channel announcement */ 4047 /* enable/disable bt channel inhibition */
4048 priv->bt_ch_announce = iwlagn_bt_ch_announce; 4048 priv->bt_ch_announce = iwlagn_bt_ch_announce;
4049 IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",
4050 (priv->bt_ch_announce) ? "On" : "Off");
4049 4051
4050 if (iwl_alloc_traffic_mem(priv)) 4052 if (iwl_alloc_traffic_mem(priv))
4051 IWL_ERR(priv, "Not enough memory to generate traffic log\n"); 4053 IWL_ERR(priv, "Not enough memory to generate traffic log\n");
@@ -4588,6 +4590,6 @@ module_param_named(antenna_coupling, iwlagn_ant_coupling, int, S_IRUGO);
4588MODULE_PARM_DESC(antenna_coupling, 4590MODULE_PARM_DESC(antenna_coupling,
4589 "specify antenna coupling in dB (defualt: 0 dB)"); 4591 "specify antenna coupling in dB (defualt: 0 dB)");
4590 4592
4591module_param_named(bt_ch_announce, iwlagn_bt_ch_announce, bool, S_IRUGO); 4593module_param_named(bt_ch_inhibition, iwlagn_bt_ch_announce, bool, S_IRUGO);
4592MODULE_PARM_DESC(bt_ch_announce, 4594MODULE_PARM_DESC(bt_ch_inhibition,
4593 "Enable BT channel announcement mode (default: enable)"); 4595 "Disable BT channel inhibition (default: enable)");