From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 29 Jul 2011 12:25:46 +0000 (+0000)
Subject: ath9k: fix switching channel bandwidth from 5/10 back to 20mhz
X-Git-Tag: reboot~16143
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a5edb705b4374e1e7a1cf323f81a57debbad8a05;p=openwrt%2Fstaging%2Fchunkeey.git

ath9k: fix switching channel bandwidth from 5/10 back to 20mhz

SVN-Revision: 27827
---

diff --git a/package/mac80211/patches/540-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/540-ath9k_channelbw_debugfs.patch
index 9c2c014a5e..28251eeef1 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 29ed81aba3..7bc92f13eb 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);