FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-24 22:41:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ath9k_hw: Remove CHANNEL_CW_INT

Browse Source 
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>
This commit is contained in:
Sujith Manoharan 2013-03-04 12:42:52 +05:30 committed by John W. Linville
parent 8f0c3b6d44
commit fcb9a3de1e
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath9k/calib.c
View File

@ -369,7 +369,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
struct ieee80211_channel *c = chan->chan; struct ieee80211_channel *c = chan->chan;
struct ath9k_hw_cal_data *caldata = ah->caldata; struct ath9k_hw_cal_data *caldata = ah->caldata;
chan->channelFlags &= (~CHANNEL_CW_INT);
if (REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) { if (REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) {
ath_dbg(common, CALIBRATE, ath_dbg(common, CALIBRATE,
"NF did not complete in calibration window\n"); "NF did not complete in calibration window\n");
@ -384,7 +383,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
ath_dbg(common, CALIBRATE, ath_dbg(common, CALIBRATE,
"noise floor failed detected; detected %d, threshold %d\n", "noise floor failed detected; detected %d, threshold %d\n",
nf, nfThresh); nf, nfThresh);
chan->channelFlags |= CHANNEL_CW_INT;
} }
if (!caldata) { if (!caldata) {
@ -410,7 +408,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,
int i, j; int i, j;
ah->caldata->channel = chan->channel; ah->caldata->channel = chan->channel;
ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT; ah->caldata->channelFlags = chan->channelFlags;
ah->caldata->chanmode = chan->chanmode; ah->caldata->chanmode = chan->chanmode;
h = ah->caldata->nfCalHist; h = ah->caldata->nfCalHist;
default_nf = ath9k_hw_get_default_nf(ah, chan); default_nf = ath9k_hw_get_default_nf(ah, chan);

6
drivers/net/wireless/ath/ath9k/hw.c
View File

@ -1761,10 +1761,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
ath9k_hw_getnf(ah, ah->curchan); ath9k_hw_getnf(ah, ah->curchan);
ah->caldata = caldata; ah->caldata = caldata;
if (caldata && if (caldata && (chan->channel != caldata->channel ||
(chan->channel != caldata->channel || chan->channelFlags != caldata->channelFlags)) {
(chan->channelFlags & ~CHANNEL_CW_INT) !=
(caldata->channelFlags & ~CHANNEL_CW_INT))) {
/* Operating channel changed, reset channel calibration data */ /* Operating channel changed, reset channel calibration data */
memset(caldata, 0, sizeof(*caldata)); memset(caldata, 0, sizeof(*caldata));
ath9k_init_nfcal_hist_buffer(ah, chan); ath9k_init_nfcal_hist_buffer(ah, chan);

1
drivers/net/wireless/ath/ath9k/hw.h
View File

@ -363,7 +363,6 @@ enum ath9k_int {
ATH9K_INT_NOCARD = 0xffffffff ATH9K_INT_NOCARD = 0xffffffff
}; };
#define CHANNEL_CW_INT 0x00002
#define CHANNEL_CCK 0x00020 #define CHANNEL_CCK 0x00020
#define CHANNEL_OFDM 0x00040 #define CHANNEL_OFDM 0x00040
#define CHANNEL_2GHZ 0x00080 #define CHANNEL_2GHZ 0x00080