summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-29 12:25:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-29 12:25:46 +0000
commita5edb705b4374e1e7a1cf323f81a57debbad8a05 (patch)
tree0576e300b69a81bcb1bcb54bf0d877bdcd2b58f1
parente4b6839fd399aa4e66712af87c51b1934c9b1d16 (diff)
downloadmtk-20170518-a5edb705b4374e1e7a1cf323f81a57debbad8a05.zip
mtk-20170518-a5edb705b4374e1e7a1cf323f81a57debbad8a05.tar.gz
mtk-20170518-a5edb705b4374e1e7a1cf323f81a57debbad8a05.tar.bz2
ath9k: fix switching channel bandwidth from 5/10 back to 20mhz
SVN-Revision: 27827
-rw-r--r--package/mac80211/patches/540-ath9k_channelbw_debugfs.patch5
-rw-r--r--package/mac80211/patches/595-ath9k_cur_txpower.patch4
2 files changed, 6 insertions, 3 deletions
diff --git a/package/mac80211/patches/540-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/540-ath9k_channelbw_debugfs.patch
index 9c2c014..28251ee 100644
--- a/package/mac80211/patches/540-ath9k_channelbw_debugfs.patch
+++ b/package/mac80211/patches/540-ath9k_channelbw_debugfs.patch
@@ -30,7 +30,7 @@
int r;
if (sc->sc_flags & SC_OP_INVALID)
-@@ -268,6 +269,21 @@ static int ath_set_channel(struct ath_so
+@@ -268,6 +269,24 @@ static int ath_set_channel(struct ath_so
if (!stopped || !(sc->sc_flags & SC_OP_OFFCHANNEL))
fastcc = false;
@@ -44,6 +44,9 @@
+ hchan->channelFlags &= ~CHANNEL_QUARTER;
+ hchan->channelFlags |= CHANNEL_HALF;
+ break;
++ default:
++ hchan->channelFlags &= ~(CHANNEL_HALF | CHANNEL_QUARTER);
++ break;
+ }
+
+ if (oldflags != hchan->channelFlags)
diff --git a/package/mac80211/patches/595-ath9k_cur_txpower.patch b/package/mac80211/patches/595-ath9k_cur_txpower.patch
index 29ed81a..7bc92f1 100644
--- a/package/mac80211/patches/595-ath9k_cur_txpower.patch
+++ b/package/mac80211/patches/595-ath9k_cur_txpower.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1724,6 +1724,8 @@ static int ath9k_config(struct ieee80211
+@@ -1727,6 +1727,8 @@ static int ath9k_config(struct ieee80211
return -EINVAL;
}
@@ -9,7 +9,7 @@
/*
* The most recent snapshot of channel->noisefloor for the old
* channel is only available after the hardware reset. Copy it to
-@@ -1741,6 +1743,7 @@ static int ath9k_config(struct ieee80211
+@@ -1744,6 +1746,7 @@ static int ath9k_config(struct ieee80211
ath9k_cmn_update_txpow(ah, sc->curtxpow,
sc->config.txpowlimit, &sc->curtxpow);
ath9k_ps_restore(sc);