From 5954a65c7da77386937ce2387e8e7001779ac8df Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 28 Jan 2013 09:58:31 +0100 Subject: [PATCH] --- yaml --- r: 352333 b: refs/heads/master c: 6690c01d168ecc620139dbd9df8affc2ac8e0683 h: refs/heads/master i: 352331: 7d706c639a123664b79c9ab5f2a58cbba6eacedb v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/rs.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5a0e215735c3..971d42853dd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ca151b568b67a7b72dcfc6ee6ea7c107ddd795c +refs/heads/master: 6690c01d168ecc620139dbd9df8affc2ac8e0683 diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/rs.c b/trunk/drivers/net/wireless/iwlwifi/dvm/rs.c index 2eb4277a7126..a131227c49e9 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/rs.c +++ b/trunk/drivers/net/wireless/iwlwifi/dvm/rs.c @@ -411,8 +411,9 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, * BT traffic, as they would just be disrupted by BT. */ if (priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH) { - IWL_ERR(priv, "BT traffic (%d), no aggregation allowed\n", - priv->bt_traffic_load); + IWL_DEBUG_COEX(priv, + "BT traffic (%d), no aggregation allowed\n", + priv->bt_traffic_load); return ret; }