From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Fri, 11 Feb 2011 16:13:14 +0000 (-0800)
Subject: iwlwifi: enable 2-wire bt coex support for non-combo device
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=73b78a22720087d2d384bdd49e9c25500ba73edd;p=linux-beck.git

iwlwifi: enable 2-wire bt coex support for non-combo device

For non-combo devices, 2-wire BT coex is needed to make sure BT coex
still function with external BT devices

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c04d99124ca8..9965215697bb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2744,9 +2744,11 @@ static void iwl_alive_start(struct iwl_priv *priv)
 			priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
 	}
 
-	if (priv->cfg->bt_params &&
-	    !priv->cfg->bt_params->advanced_bt_coexist) {
-		/* Configure Bluetooth device coexistence support */
+	if (!priv->cfg->bt_params || (priv->cfg->bt_params &&
+	    !priv->cfg->bt_params->advanced_bt_coexist)) {
+		/*
+		 * default is 2-wire BT coexexistence support
+		 */
 		priv->cfg->ops->hcmd->send_bt_config(priv);
 	}