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

Commit 76061abb authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: make request to get the noisefloor threshold band specific 



Lets make the request to get the current noise floor threshold
from the EEPROM band specific as it is band specific, not mode
specific.

This also adds a backpointer on the private channel structure
back to the ieee80211_channel structure as this is now needed during
ath9k_hw_getnf().

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ae8d2858

drivers/net/wireless/ath9k/ath9k.h

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ struct ath9k_11n_rate_series { 
	 CHANNEL_HT40MINUS)



struct ath9k_channel {

	struct ieee80211_channel *chan;

	u16 channel;

	u32 channelFlags;

	u8 privFlags;

drivers/net/wireless/ath9k/calib.c

+7 −14
Original line number Diff line number Diff line
@@ -168,26 +168,18 @@ static void ath9k_hw_do_getnf(struct ath_hal *ah, 
}



static bool getNoiseFloorThresh(struct ath_hal *ah,

				const struct ath9k_channel *chan,

				enum ieee80211_band band,

				int16_t *nft)

{

	switch (chan->chanmode) {

	case CHANNEL_A:

	case CHANNEL_A_HT20:

	case CHANNEL_A_HT40PLUS:

	case CHANNEL_A_HT40MINUS:

	switch (band) {

	case IEEE80211_BAND_5GHZ:

		*nft = (int8_t)ath9k_hw_get_eeprom(ah, EEP_NFTHRESH_5);

		break;

	case CHANNEL_B:

	case CHANNEL_G:

	case CHANNEL_G_HT20:

	case CHANNEL_G_HT40PLUS:

	case CHANNEL_G_HT40MINUS:

	case IEEE80211_BAND_2GHZ:

		*nft = (int8_t)ath9k_hw_get_eeprom(ah, EEP_NFTHRESH_2);

		break;

	default:

		DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL,

			"invalid channel flags 0x%x\n", chan->channelFlags);

		BUG_ON(1);

		return false;

	}
@@ -692,6 +684,7 @@ int16_t ath9k_hw_getnf(struct ath_hal *ah, 
	int16_t nf, nfThresh;

	int16_t nfarray[NUM_NF_READINGS] = { 0 };

	struct ath9k_nfcal_hist *h;

	struct ieee80211_channel *c = chan->chan;

	u8 chainmask;



	if (AR_SREV_9280(ah))
@@ -709,7 +702,7 @@ int16_t ath9k_hw_getnf(struct ath_hal *ah, 
	} else {

		ath9k_hw_do_getnf(ah, nfarray);

		nf = nfarray[0];

		if (getNoiseFloorThresh(ah, chan, &nfThresh)

		if (getNoiseFloorThresh(ah, c->band, &nfThresh)

		    && nf > nfThresh) {

			DPRINTF(ah->ah_sc, ATH_DBG_CALIBRATE,

				"noise floor failed detected; "

drivers/net/wireless/ath9k/main.c

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ static int ath_setup_channels(struct ath_softc *sc) 
			chan_2ghz[a].band = IEEE80211_BAND_2GHZ;

			chan_2ghz[a].center_freq = c->channel;

			chan_2ghz[a].max_power = c->maxTxPower;

			c->chan = &chan_2ghz[a];



			if (c->privFlags & CHANNEL_DISALLOW_ADHOC)

				chan_2ghz[a].flags |= IEEE80211_CHAN_NO_IBSS;
@@ -233,6 +234,7 @@ static int ath_setup_channels(struct ath_softc *sc) 
			chan_5ghz[b].band = IEEE80211_BAND_5GHZ;

			chan_5ghz[b].center_freq = c->channel;

			chan_5ghz[b].max_power = c->maxTxPower;

			c->chan = &chan_5ghz[a];



			if (c->privFlags & CHANNEL_DISALLOW_ADHOC)

				chan_5ghz[b].flags |= IEEE80211_CHAN_NO_IBSS;