From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
ipw3945-devel@lists.sourceforge.net,
Wey-Yi Guy <wey-yi.w.guy@intel.com>
Subject: [PATCH 21/26] iwlagn: add bt_ch_announce module parameter
Date: Mon, 23 Aug 2010 07:57:12 -0700 [thread overview]
Message-ID: <1282575437-23270-22-git-send-email-wey-yi.w.guy@intel.com> (raw)
In-Reply-To: <1282575437-23270-1-git-send-email-wey-yi.w.guy@intel.com>
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Add bt_ch_announce module parameter to enable/disable BT channel
announcement mode; default is "enable"
Based on the bt channel announcement module parameter to configure the
bt_config host command.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-6000.c | 6 ++++--
drivers/net/wireless/iwlwifi/iwl-agn.c | 11 +++++++++++
drivers/net/wireless/iwlwifi/iwl-dev.h | 1 +
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index e4873cc..ebf0c7e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -242,9 +242,11 @@ static void iwl6000g2b_send_bt_config(struct iwl_priv *priv)
if (!bt_coex_active || priv->iw_mode == NL80211_IFTYPE_ADHOC) {
bt_cmd.flags = 0;
} else {
- bt_cmd.flags = IWL6000G2B_BT_FLAG_CHANNEL_INHIBITION |
- IWL6000G2B_BT_FLAG_COEX_MODE_3W <<
+ bt_cmd.flags = IWL6000G2B_BT_FLAG_COEX_MODE_3W <<
IWL6000G2B_BT_FLAG_COEX_MODE_SHIFT;
+ if (priv->bt_ch_announce)
+ bt_cmd.flags |= IWL6000G2B_BT_FLAG_CHANNEL_INHIBITION;
+ IWL_DEBUG_INFO(priv, "BT coex flag: 0X%x\n", bt_cmd.flags);
}
if (priv->bt_full_concurrent)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 60f9799..e0592f4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -88,6 +88,7 @@ MODULE_LICENSE("GPL");
MODULE_ALIAS("iwl4965");
static int iwlagn_ant_coupling;
+static bool iwlagn_bt_ch_announce = 1;
/**
* iwl_commit_rxon - commit staging_rxon to hardware
@@ -2606,6 +2607,9 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
return pos;
}
+ /* enable/disable bt channel announcement */
+ priv->bt_ch_announce = iwlagn_bt_ch_announce;
+
#ifdef CONFIG_IWLWIFI_DEBUG
if (!(iwl_get_debug_level(priv) & IWL_DL_FW_ERRORS) && !full_log)
size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
@@ -4147,6 +4151,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
(iwlagn_ant_coupling > IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?
true : false;
+ /* enable/disable bt channel announcement */
+ priv->bt_ch_announce = iwlagn_bt_ch_announce;
+
if (iwl_alloc_traffic_mem(priv))
IWL_ERR(priv, "Not enough memory to generate traffic log\n");
@@ -4684,3 +4691,7 @@ MODULE_PARM_DESC(ucode_alternative,
module_param_named(antenna_coupling, iwlagn_ant_coupling, int, S_IRUGO);
MODULE_PARM_DESC(antenna_coupling,
"specify antenna coupling in dB (defualt: 0 dB)");
+
+module_param_named(bt_ch_announce, iwlagn_bt_ch_announce, bool, S_IRUGO);
+MODULE_PARM_DESC(bt_ch_announce,
+ "Enable BT channel announcement mode (default: enable)");
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 836fe27..1adb68e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1368,6 +1368,7 @@ struct iwl_priv {
/* bt coex */
u8 bt_traffic_load, notif_bt_traffic_load;
+ bool bt_ch_announce;
bool bt_sco_active;
bool bt_full_concurrent;
bool bt_ant_couple_ok;
--
1.7.0.4
next prev parent reply other threads:[~2010-08-23 14:53 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-23 14:56 [PATCH 00/26] iwlwifi update for 2.6.37 Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 01/26] iwlwifi: update out-of-date comments Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 02/26] iwlwifi: comments cleanup Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 03/26] iwlwifi: add 6000g2b BT coexist API Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 04/26] iwlagn: implement advance BT config command Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 05/26] iwlagn: set BT IGNORE for some frames Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 06/26] iwlwifi: add BT notification support for bt coex Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 07/26] iwlagn: let bluetooth traffic load impact rate scale Wey-Yi Guy
2010-08-23 14:56 ` [PATCH 08/26] iwlwifi: reset BT when going down Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 09/26] iwlagn: disable gen2b BT coexistence in IBSS Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 10/26] iwlagn: keep BT settings across restart Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 11/26] iwlwifi: Relax uCode timeout/error checking for 6000g2b Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 12/26] iwlwifi: use antenna A only under high BT load Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 13/26] iwlwifi: add bt full concurrency support Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 14/26] iwlagn: wifi/bt coex configuration sequence Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 15/26] iwlwifi: indicate bt_kill condition when receive tx reply Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 16/26] iwlwifi: add debugfs to control stuck queue timer Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 17/26] iwlwifi: add bt_init_traffic_load as configurable parameter Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 18/26] iwlagn: add bt prio_boost to .cfg Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 19/26] iwlagn: parsing uart message and take actions Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 20/26] iwlagn: add additional bt related parameters Wey-Yi Guy
2010-08-23 14:57 ` Wey-Yi Guy [this message]
2010-08-23 14:57 ` [PATCH 22/26] iwlagn: set traffic load based on multiple factors Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 23/26] iwlagn: generic bt coex functions Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 24/26] iwlagn: update bt status upon scan complete Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 25/26] iwlwifi: add bt traffic load debugfs file Wey-Yi Guy
2010-08-23 14:57 ` [PATCH 26/26] iwlwifi: disable aggregation queue if stopped early Wey-Yi Guy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282575437-23270-22-git-send-email-wey-yi.w.guy@intel.com \
--to=wey-yi.w.guy@intel.com \
--cc=ipw3945-devel@lists.sourceforge.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).