X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e57f13704f089ced09e370ab7ca95a63e2d5082e..dc6188fb0ee8266eab66b8442f9b2294232465e8:/package/madwifi/patches/414-txpower.patch

diff --git a/package/madwifi/patches/414-txpower.patch b/package/madwifi/patches/414-txpower.patch
index af5a04b61..753cd010f 100644
--- a/package/madwifi/patches/414-txpower.patch
+++ b/package/madwifi/patches/414-txpower.patch
@@ -129,7 +129,7 @@
  		ic->ic_flags &= ~IEEE80211_F_TXPOW_FIXED;
  	}
  done:
-@@ -1588,9 +1574,22 @@ ieee80211_ioctl_giwtxpow(struct net_devi
+@@ -1588,9 +1574,23 @@ ieee80211_ioctl_giwtxpow(struct net_devi
  {
  	struct ieee80211vap *vap = dev->priv;
  	struct ieee80211com *ic = vap->iv_ic;
@@ -142,7 +142,8 @@
 +
 +	if (ic->ic_bsschan && (ic->ic_bsschan != IEEE80211_CHAN_ANYC)) {
 +		txp = min(txp, (u16) ic->ic_bsschan->ic_maxpower);
-+	} else if (ic->ic_cur_txpower > 0) {
++	}
++	if (ic->ic_cur_txpower > 0) {
 +		txp = min(txp, ic->ic_cur_txpower);
 +	}
 +	if (ic->ic_flags & IEEE80211_F_TXPOW_FIXED) {