ath9k_htc: remove use of common->ani.noise_floor
Subsystems (3)
PATCH 1/6 ath9k_htc: remove use of common->ani.noise_floor
It is unused aside from a single redundant debug message
--- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath9k/htc_drv_main.c +1 -12
@@ -760,23 +760,12 @@ void ath9k_ani_work(struct work_struct *work)ath9k_hw_ani_monitor (ah, ah->curchan);/* Perform calibration if necessary */ -if (longcal || shortcal) { +if (longcal || shortcal) common->ani.caldone =ath9k_hw_calibrate (ah, ah->curchan, common->rx_chainmask, longcal); -if (longcal) - common->ani.noise_floor = -ath9k_hw_getchan_noise (ah, ah->curchan); - -ath_print (common,ATH_DBG_ANI , -" calibrate chan %u/%x nf: %d\n" , - ah->curchan->channel, - ah->curchan->channelFlags, - common->ani.noise_floor); - } -ath9k_htc_ps_restore (priv); }
Signature · 1 line
1.7.2.2
PATCH 2/6 ath9k_hw: keep calibrated noise floor values per channel
--- drivers/net/wireless/ath/ath9k/calib.c | 40 ++++++++++++++++---------------- drivers/net/wireless/ath/ath9k/hw.c | 2 +- drivers/net/wireless/ath/ath9k/hw.h | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-)
drivers/net/wireless/ath/ath9k/calib.c +20 -20
@@ -346,34 +346,34 @@ 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; -if (!caldata) -return false; - chan->channelFlags &= (~CHANNEL_CW_INT );if (REG_READ (ah,AR_PHY_AGC_CONTROL ) &AR_PHY_AGC_CONTROL_NF ) {ath_print (common,ATH_DBG_CALIBRATE ,"NF did not complete in calibration window\n" ); - nf =0 ; - caldata->rawNoiseFloor = nf;return false; - }else { -ath9k_hw_do_getnf (ah, nfarray); -ath9k_hw_nf_sanitize (ah, nfarray); - nf = nfarray[0 ]; -if (ath9k_hw_get_nf_thresh (ah, c->band, &nfThresh) - && nf > nfThresh) { -ath_print (common,ATH_DBG_CALIBRATE , -"noise floor failed detected; " -"detected %d, threshold %d\n" , - nf, nfThresh); - chan->channelFlags |=CHANNEL_CW_INT ; - } + } + +ath9k_hw_do_getnf (ah, nfarray); +ath9k_hw_nf_sanitize (ah, nfarray); + nf = nfarray[0 ]; +if (ath9k_hw_get_nf_thresh (ah, c->band, &nfThresh) + && nf > nfThresh) { +ath_print (common,ATH_DBG_CALIBRATE , +"noise floor failed detected; " +"detected %d, threshold %d\n" , + nf, nfThresh); + chan->channelFlags |=CHANNEL_CW_INT ; + } + +if (!caldata) { + chan->noisefloor = nf; +return false; } h = caldata->nfCalHist; caldata->nfcal_pending = false;ath9k_hw_update_nfcal_hist_buffer (ah, caldata, nfarray); - caldata->rawNoiseFloor = h[0 ].privNF; + chan->noisefloor = h[0 ].privNF;return true; }
@@ -401,10 +401,10 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,s16 ath9k_hw_getchan_noise (struct ath_hw *ah,struct ath9k_channel *chan) { -if (!ah->caldata || !ah->caldata->rawNoiseFloor) +if (!ah->curchan || !ah->curchan->noisefloor)return ath9k_hw_get_default_nf (ah, chan); -return ah->caldata->rawNoiseFloor; +return ah->curchan->noisefloor; }EXPORT_SYMBOL (ath9k_hw_getchan_noise);
drivers/net/wireless/ath/ath9k/hw.c +1 -1
@@ -1239,7 +1239,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,if (!ath9k_hw_setpower (ah,ATH9K_PM_AWAKE ))return -EIO ; -if (curchan && !ah->chip_fullsleep && ah->caldata) +if (curchan && !ah->chip_fullsleep)ath9k_hw_getnf (ah, curchan); ah->caldata = caldata;
drivers/net/wireless/ath/ath9k/hw.h +1 -1
@@ -342,7 +342,6 @@ struct ath9k_hw_cal_data {int32_t CalValid;int8_t iCoff;int8_t qCoff; -int16_t rawNoiseFloor;bool paprd_done;bool nfcal_pending;bool nfcal_interference;
@@ -356,6 +355,7 @@ struct ath9k_channel {u16 channel;u32 channelFlags;u32 chanmode; +s16 noisefloor; };#define IS_CHAN_G (_c) ((((_c)->channelFlags & (CHANNEL_G)) == CHANNEL_G) || \
Signature · 1 line
1.7.2.2
PATCH 3/6 ath9k: do not return default noise floor values via survey
--- drivers/net/wireless/ath/ath9k/main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +5 -3
@@ -2004,15 +2004,17 @@ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,struct ath_wiphy *aphy = hw->priv;struct ath_softc *sc = aphy->sc;struct ath_hw *ah = sc->sc_ah; -struct ath_common *common =ath9k_hw_common (ah);struct ieee80211_conf *conf = &hw->conf;if (idx !=0 )return -ENOENT ; survey->channel = conf->channel; - survey->filled =SURVEY_INFO_NOISE_DBM ; - survey->noise = common->ani.noise_floor; + survey->filled =0 ; +if (ah->curchan && ah->curchan->noisefloor) { + survey->filled |=SURVEY_INFO_NOISE_DBM ; + survey->noise = ah->curchan->noisefloor; + }return 0 ; }
Signature · 1 line
1.7.2.2
PATCH 4/6 ath9k: remove the noise floor value in the ani struct
common->ani.noise_floor is now only used for a similar redundant debug message similar to the one that was removed from ath9k_htc in an earlier patch. Remove it from ath9k as well now.
--- drivers/net/wireless/ath/ath.h | 1 - drivers/net/wireless/ath/ath9k/init.c | 1 - drivers/net/wireless/ath/ath9k/main.c | 10 ---------- 3 files changed, 0 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath.h +0 -1
@@ -35,7 +35,6 @@ static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};struct ath_ani {bool caldone; -int16_t noise_floor;unsigned int longcal_timer;unsigned int shortcal_timer;unsigned int resetcal_timer;
drivers/net/wireless/ath/ath9k/init.c +0 -1
@@ -506,7 +506,6 @@ static void ath9k_init_misc(struct ath_softc *sc)struct ath_common *common =ath9k_hw_common (sc->sc_ah);int i =0 ; - common->ani.noise_floor =ATH_DEFAULT_NOISE_FLOOR ;setup_timer (&common->ani.timer, ath_ani_calibrate, (unsigned long )sc); sc->config.txpowlimit =ATH_TXPOWER_MAX ;
drivers/net/wireless/ath/ath9k/main.c +0 -10
@@ -459,16 +459,6 @@ void ath_ani_calibrate(unsigned long data) ah->curchan, common->rx_chainmask, longcal); - -if (longcal) - common->ani.noise_floor =ath9k_hw_getchan_noise (ah, - ah->curchan); - -ath_print (common,ATH_DBG_ANI , -" calibrate chan %u/%x nf: %d\n" , - ah->curchan->channel, - ah->curchan->channelFlags, - common->ani.noise_floor); } }
Signature · 1 line
1.7.2.2
PATCH 5/6 nl80211: allow drivers to indicate whether the survey data channel is in use
Some user space applications only want to display survey data for the operating channel, however there is no API to get that yet.
--- include/linux/nl80211.h | 2 ++ include/net/cfg80211.h | 2 ++ net/wireless/nl80211.c | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-)
include/linux/nl80211.h +2 -0
@@ -1400,6 +1400,7 @@ enum nl80211_reg_rule_flags {* @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm) +* @NL80211_SURVEY_INFO_IN_USE: channel is currently being used * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number * currently defined * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
@@ -1408,6 +1409,7 @@ enum nl80211_survey_info { __NL80211_SURVEY_INFO_INVALID,NL80211_SURVEY_INFO_FREQUENCY ,NL80211_SURVEY_INFO_NOISE , +NL80211_SURVEY_INFO_IN_USE ,/* keep last */ __NL80211_SURVEY_INFO_AFTER_LAST,
include/net/cfg80211.h +2 -0
@@ -293,12 +293,14 @@ struct key_params {* enum survey_info_flags - survey information flags * * @SURVEY_INFO_NOISE_DBM: noise (in dBm) was filled in +* @SURVEY_INFO_IN_USE: channel is currently being used * * Used by the driver to indicate which info in &struct survey_info * it has filled in during the get_survey(). */ enum survey_info_flags {SURVEY_INFO_NOISE_DBM =1 <<0 , +SURVEY_INFO_IN_USE =1 <<1 , };/**
net/wireless/nl80211.c +2 -0
@@ -3489,6 +3489,8 @@ static int nl80211_send_survey(struct sk_buff *msg, u32 pid, u32 seq,if (survey->filled &SURVEY_INFO_NOISE_DBM )NLA_PUT_U8 (msg,NL80211_SURVEY_INFO_NOISE , survey->noise); +if (survey->filled &SURVEY_INFO_IN_USE ) +NLA_PUT_FLAG (msg,NL80211_SURVEY_INFO_IN_USE );nla_nest_end (msg, infoattr);
Signature · 1 line
1.7.2.2
PATCH 6/6 ath9k: return survey data for all channels instead of just the current one
--- drivers/net/wireless/ath/ath9k/main.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +21 -6
@@ -1994,16 +1994,31 @@ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,struct ath_wiphy *aphy = hw->priv;struct ath_softc *sc = aphy->sc;struct ath_hw *ah = sc->sc_ah; -struct ieee80211_conf *conf = &hw->conf; +struct ieee80211_supported_band *sband; +struct ath9k_channel *chan; + + sband = hw->wiphy->bands[IEEE80211_BAND_2GHZ ]; +if (sband && idx >= sband->n_channels) { + idx -= sband->n_channels; + sband =NULL ; + } -if (idx !=0 ) -return -ENOENT ; +if (!sband) + sband = hw->wiphy->bands[IEEE80211_BAND_5GHZ ]; - survey->channel = conf->channel; +if (idx >= sband->n_channels) +return -ENOENT ; + + survey->channel = &sband->channels[idx]; + chan = &ah->channels[survey->channel->hw_value]; survey->filled =0 ; -if (ah->curchan && ah->curchan->noisefloor) { + +if (chan == ah->curchan) + survey->filled |=SURVEY_INFO_IN_USE ; + +if (chan->noisefloor) { survey->filled |=SURVEY_INFO_NOISE_DBM ; - survey->noise = ah->curchan->noisefloor; + survey->noise = chan->noisefloor; }return 0 ;
Signature · 1 line
1.7.2.2
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 6/6 ath9k: return survey data for all channels instead of just the current one
---
v2: add a missing null pointer check for 5ghz sband (thx, paul)
drivers/net/wireless/ath/ath9k/main.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +21 -6
@@ -1994,16 +1994,31 @@ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,struct ath_wiphy *aphy = hw->priv;struct ath_softc *sc = aphy->sc;struct ath_hw *ah = sc->sc_ah; -struct ieee80211_conf *conf = &hw->conf; +struct ieee80211_supported_band *sband; +struct ath9k_channel *chan; + + sband = hw->wiphy->bands[IEEE80211_BAND_2GHZ ]; +if (sband && idx >= sband->n_channels) { + idx -= sband->n_channels; + sband =NULL ; + } -if (idx !=0 ) -return -ENOENT ; +if (!sband) + sband = hw->wiphy->bands[IEEE80211_BAND_5GHZ ]; - survey->channel = conf->channel; +if (!sband || idx >= sband->n_channels) +return -ENOENT ; + + survey->channel = &sband->channels[idx]; + chan = &ah->channels[survey->channel->hw_value]; survey->filled =0 ; -if (ah->curchan && ah->curchan->noisefloor) { + +if (chan == ah->curchan) + survey->filled |=SURVEY_INFO_IN_USE ; + +if (chan->noisefloor) { survey->filled |=SURVEY_INFO_NOISE_DBM ; - survey->noise = ah->curchan->noisefloor; + survey->noise = chan->noisefloor; }return 0 ;