diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-03 16:06:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-03 16:06:43 -0500 |
| commit | fd95240568977ebd1ebb15b071464e0e392cde1a (patch) | |
| tree | 6458cf8f33a8b8ab6a8098208de29c83206ca3aa /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | cdfb74d4c2e3bcc9383121af2591d0ae15007ba7 (diff) | |
| parent | fa9a741b841d0c2db04875310a06e8718c56fd4f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index eb16647cfbe0..646ccb2430b4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -3077,8 +3077,7 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work) | |||
| 3077 | } | 3077 | } |
| 3078 | 3078 | ||
| 3079 | if (priv->start_calib) { | 3079 | if (priv->start_calib) { |
| 3080 | if (priv->cfg->bt_params && | 3080 | if (iwl_bt_statistics(priv)) { |
| 3081 | priv->cfg->bt_params->bt_statistics) { | ||
| 3082 | iwl_chain_noise_calibration(priv, | 3081 | iwl_chain_noise_calibration(priv, |
| 3083 | (void *)&priv->_agn.statistics_bt); | 3082 | (void *)&priv->_agn.statistics_bt); |
| 3084 | iwl_sensitivity_calibration(priv, | 3083 | iwl_sensitivity_calibration(priv, |