iwlwifi: mvm: fix the {ack,cts}_kill_msk

The masks were wrong. They should be 0xffffffff when SCO,
HID or SNIFF profiles are used. They should be 0xffff0000
in any other case (default) to get a bit more throughput
when the BT profile allows for it.

Fix a debug print on the way.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 47954deb64936683705d4e74c627fe8ba0e35028..99f78737f8ff535f935df6cb9f20f55a4d180252 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -125,15 +125,15 @@ enum iwl_bt_kill_msk {
 };
 
 static const u32 iwl_bt_ack_kill_msk[BT_KILL_MSK_MAX] = {
-       0xffffffff,
-       0xfffffc00,
-       0,
+       [BT_KILL_MSK_DEFAULT] = 0xffff0000,
+       [BT_KILL_MSK_SCO_HID_A2DP] = 0xffffffff,
+       [BT_KILL_MSK_REDUCED_TXPOW] = 0,
 };
 
 static const u32 iwl_bt_cts_kill_msk[BT_KILL_MSK_MAX] = {
-       0xffffffff,
-       0xfffffc00,
-       0,
+       [BT_KILL_MSK_DEFAULT] = 0xffff0000,
+       [BT_KILL_MSK_SCO_HID_A2DP] = 0xffffffff,
+       [BT_KILL_MSK_REDUCED_TXPOW] = 0,
 };
 
 #define IWL_BT_DEFAULT_BOOST (0xf0f0f0f0)
@@ -327,7 +327,7 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
                return 0;
 
        IWL_DEBUG_COEX(mvm,
-                      "Udpate kill_msk: %d\n\t SCO %sactive A2DP %sactive SNIFF %sactive\n",
+                      "Update kill_msk: %d - SCO %sactive A2DP %sactive SNIFF %sactive\n",
                       bt_kill_msk,
                       BT_MBOX_MSG(notif, 3, SCO_STATE) ? "" : "in",
                       BT_MBOX_MSG(notif, 3, A2DP_STATE) ? "" : "in",