iwlwifi: enable 2-wire bt coex support for non-combo device
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 11 Feb 2011 16:13:14 +0000 (08:13 -0800)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Mon, 21 Feb 2011 18:09:16 +0000 (10:09 -0800)
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>
drivers/net/wireless/iwlwifi/iwl-agn.c

index c04d99124ca8d0e1a77dc9a8a9da0464860ec2b4..9965215697bb4efa293f58adce9832f346e9dc18 100644 (file)
@@ -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);
        }