From e3893f7d702233e290dca8bd635523a7cbcb730d Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 7 Mar 2012 09:52:10 -0800 Subject: [PATCH] --- yaml --- r: 291293 b: refs/heads/master c: fdeff46586e01c4b8ceb461a72a46fc6ef00a771 h: refs/heads/master i: 291291: 73b1726b856e42080bb050ea3d1c93d2ed08cd2b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6eb4220c7ac2..e5957ef368b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc4bf501a237f5232df6d4aeb7b24ac0362958c8 +refs/heads/master: fdeff46586e01c4b8ceb461a72a46fc6ef00a771 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c index 579679edd5f1..84cbe7bb504c 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c @@ -879,10 +879,8 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig, } static void iwlagn_gain_computation(struct iwl_priv *priv, - u32 average_noise[NUM_RX_CHAINS], - u16 min_average_noise_antenna_i, - u32 min_average_noise, - u8 default_chain) + u32 average_noise[NUM_RX_CHAINS], + u8 default_chain) { int i; s32 delta_g; @@ -1087,7 +1085,6 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) min_average_noise, min_average_noise_antenna_i); iwlagn_gain_computation(priv, average_noise, - min_average_noise_antenna_i, min_average_noise, find_first_chain(hw_params(priv).valid_rx_ant)); /* Some power changes may have been made during the calibration.