diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-03-04 02:12:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-03-06 16:28:52 -0500 |
commit | fcb9a3de1e72cb271343aa9484a20c066b6c4eee (patch) | |
tree | 0a56de2da54c5bf274dc442011911c048e3a2a54 /drivers/net/wireless/ath/ath9k/calib.c | |
parent | 8f0c3b6d44e09f497f57ca2997d903c5602336a1 (diff) |
ath9k_hw: Remove CHANNEL_CW_INT
This flag is used for indicating channel interference and
we currently do nothing with it, so remove it.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/calib.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/calib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c index 1e8508530e98..7bdd726c7a8f 100644 --- a/drivers/net/wireless/ath/ath9k/calib.c +++ b/drivers/net/wireless/ath/ath9k/calib.c | |||
@@ -369,7 +369,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan) | |||
369 | struct ieee80211_channel *c = chan->chan; | 369 | struct ieee80211_channel *c = chan->chan; |
370 | struct ath9k_hw_cal_data *caldata = ah->caldata; | 370 | struct ath9k_hw_cal_data *caldata = ah->caldata; |
371 | 371 | ||
372 | chan->channelFlags &= (~CHANNEL_CW_INT); | ||
373 | if (REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) { | 372 | if (REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) { |
374 | ath_dbg(common, CALIBRATE, | 373 | ath_dbg(common, CALIBRATE, |
375 | "NF did not complete in calibration window\n"); | 374 | "NF did not complete in calibration window\n"); |
@@ -384,7 +383,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan) | |||
384 | ath_dbg(common, CALIBRATE, | 383 | ath_dbg(common, CALIBRATE, |
385 | "noise floor failed detected; detected %d, threshold %d\n", | 384 | "noise floor failed detected; detected %d, threshold %d\n", |
386 | nf, nfThresh); | 385 | nf, nfThresh); |
387 | chan->channelFlags |= CHANNEL_CW_INT; | ||
388 | } | 386 | } |
389 | 387 | ||
390 | if (!caldata) { | 388 | if (!caldata) { |
@@ -410,7 +408,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah, | |||
410 | int i, j; | 408 | int i, j; |
411 | 409 | ||
412 | ah->caldata->channel = chan->channel; | 410 | ah->caldata->channel = chan->channel; |
413 | ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT; | 411 | ah->caldata->channelFlags = chan->channelFlags; |
414 | ah->caldata->chanmode = chan->chanmode; | 412 | ah->caldata->chanmode = chan->chanmode; |
415 | h = ah->caldata->nfCalHist; | 413 | h = ah->caldata->nfCalHist; |
416 | default_nf = ath9k_hw_get_default_nf(ah, chan); | 414 | default_nf = ath9k_hw_get_default_nf(ah, chan); |