From dd0091c80200e6f73efb6b85ecc3e1171f475ea5 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 9 Jun 2010 01:46:32 -0700 Subject: [PATCH] --- yaml --- r: 202993 b: refs/heads/master c: aa9746af8fa26d28d442a7415c701eb5dfeb7a2a h: refs/heads/master i: 202991: 71c0051ae67af092c9b549c30222753f4fb0db24 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 651a591b6326..ffffdb86563e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fb291eea70353618fe10d94f05d16caf51f435f +refs/heads/master: aa9746af8fa26d28d442a7415c701eb5dfeb7a2a diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-calib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-calib.c index 7e8227773213..22fa947e8756 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-calib.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-calib.c @@ -846,6 +846,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv, } } + if (active_chains != priv->hw_params.valid_rx_ant && + active_chains != priv->chain_noise_data.active_chains) + IWL_WARN(priv, + "Detected that not all antennas are connected! " + "Connected: %#x, valid: %#x.\n", + active_chains, priv->hw_params.valid_rx_ant); + /* Save for use within RXON, TX, SCAN commands, etc. */ priv->chain_noise_data.active_chains = active_chains; IWL_DEBUG_CALIB(priv, "active_chains (bitwise) = 0x%x\n",