summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/515-ath9k_multi_channel_nf.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-07 14:27:54 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-07 14:27:54 +0000
commit4f3f9fa20381cbbda05497a1c0f94c1eecebfb3b (patch)
treed28369843e071c301a4dc0ebcd70452a1316402f /package/mac80211/patches/515-ath9k_multi_channel_nf.patch
parent8631d395e17adfd4c61ef1bf856cbf6a1cb7c307 (diff)
mac80211: update to wireless-testing 2010-10-06
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23294 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/515-ath9k_multi_channel_nf.patch')
-rw-r--r--package/mac80211/patches/515-ath9k_multi_channel_nf.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/package/mac80211/patches/515-ath9k_multi_channel_nf.patch b/package/mac80211/patches/515-ath9k_multi_channel_nf.patch
deleted file mode 100644
index 468da97ef..000000000
--- a/package/mac80211/patches/515-ath9k_multi_channel_nf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1995,16 +1995,31 @@ static int ath9k_get_survey(struct ieee8
- 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;
-
-- if (idx != 0)
-- return -ENOENT;
-+ sband = hw->wiphy->bands[IEEE80211_BAND_2GHZ];
-+ if (sband && idx >= sband->n_channels) {
-+ idx -= sband->n_channels;
-+ sband = NULL;
-+ }
-+
-+ if (!sband)
-+ sband = hw->wiphy->bands[IEEE80211_BAND_5GHZ];
-+
-+ if (idx >= sband->n_channels)
-+ return -ENOENT;
-
-- survey->channel = conf->channel;
-+ 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;