Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcb9a3de authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

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: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8f0c3b6d

drivers/net/wireless/ath/ath9k/calib.c

+1 −3
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan) 
	struct ieee80211_channel *c = chan->chan;

	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) {

		ath_dbg(common, CALIBRATE,

			"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,

			"noise floor failed detected; detected %d, threshold %d\n",

			nf, nfThresh);

		chan->channelFlags |= CHANNEL_CW_INT;

	}



	if (!caldata) {
@@ -410,7 +408,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah, 
	int i, j;



	ah->caldata->channel = chan->channel;

	ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT;

	ah->caldata->channelFlags = chan->channelFlags;

	ah->caldata->chanmode = chan->chanmode;

	h = ah->caldata->nfCalHist;

	default_nf = ath9k_hw_get_default_nf(ah, chan);

drivers/net/wireless/ath/ath9k/hw.c

+2 −4
Original line number Diff line number Diff line
@@ -1761,10 +1761,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
		ath9k_hw_getnf(ah, ah->curchan);



	ah->caldata = caldata;

	if (caldata &&

	    (chan->channel != caldata->channel ||

	     (chan->channelFlags & ~CHANNEL_CW_INT) !=

	     (caldata->channelFlags & ~CHANNEL_CW_INT))) {

	if (caldata && (chan->channel != caldata->channel ||

			chan->channelFlags != caldata->channelFlags)) {

		/* Operating channel changed, reset channel calibration data */

		memset(caldata, 0, sizeof(*caldata));

		ath9k_init_nfcal_hist_buffer(ah, chan);

drivers/net/wireless/ath/ath9k/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ enum ath9k_int { 
	ATH9K_INT_NOCARD = 0xffffffff

};



#define CHANNEL_CW_INT    0x00002

#define CHANNEL_CCK       0x00020

#define CHANNEL_OFDM      0x00040

#define CHANNEL_2GHZ      0x00080