aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi/patches/414-txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-09-16 12:02:10 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-09-16 12:02:10 +0000
commit5b7afa25a4e226728c3e7e7ce12a48733aa4e0f4 (patch)
tree6a81c9929b190bc7faea33eb9f426a0916b83389 /package/madwifi/patches/414-txpower.patch
parentc417595371182c1fdbeea746a891331a5a5dfb2e (diff)
downloadupstream-5b7afa25a4e226728c3e7e7ce12a48733aa4e0f4.tar.gz
upstream-5b7afa25a4e226728c3e7e7ce12a48733aa4e0f4.tar.bz2
upstream-5b7afa25a4e226728c3e7e7ce12a48733aa4e0f4.zip
madwifi: fix iwconfig tx power display
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17592 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/414-txpower.patch')
-rw-r--r--package/madwifi/patches/414-txpower.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/madwifi/patches/414-txpower.patch b/package/madwifi/patches/414-txpower.patch
index af5a04b616..753cd010fd 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) {