projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
madwifi: fix iwconfig tx power display
[openwrt.git]
/
package
/
madwifi
/
patches
/
414-txpower.patch
diff --git
a/package/madwifi/patches/414-txpower.patch
b/package/madwifi/patches/414-txpower.patch
index af5a04b6160c508f2444cb0c81b1d5e8cd7df540..753cd010fd67a40728f77109b008509692c90621 100644
(file)
--- 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:
ic->ic_flags &= ~IEEE80211_F_TXPOW_FIXED;
}
done:
-@@ -1588,9 +1574,2
2
@@ ieee80211_ioctl_giwtxpow(struct net_devi
+@@ -1588,9 +1574,2
3
@@ ieee80211_ioctl_giwtxpow(struct net_devi
{
struct ieee80211vap *vap = dev->priv;
struct ieee80211com *ic = vap->iv_ic;
{
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);
+
+ 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) {
+ txp = min(txp, ic->ic_cur_txpower);
+ }
+ if (ic->ic_flags & IEEE80211_F_TXPOW_FIXED) {