summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-29 12:25:46 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-29 12:25:46 +0000
commit9ac9df93e9b7a209b603246f72a753b94daae419 (patch)
tree151ada9e2d94f3162b4f4a178a686dab7379c452
parent50841b8f24a56c5f920d58a64e407269954669dc (diff)
ath9k: fix switching channel bandwidth from 5/10 back to 20mhz
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27827 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 9c2c014a5..28251eeef 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 29ed81aba..7bc92f13e 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);