X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a5fbb602d476c54718ceff0576772f841def79f5..a4bdef9ca9051d829ee12f9f8ae36016f0c2136e:/package/madwifi/patches/414-txpower.patch

diff --git a/package/madwifi/patches/414-txpower.patch b/package/madwifi/patches/414-txpower.patch
index 3e7e315d1..5300de90c 100644
--- a/package/madwifi/patches/414-txpower.patch
+++ b/package/madwifi/patches/414-txpower.patch
@@ -63,7 +63,7 @@
  
 +	power = ic->ic_max_txpower;
 +	if (ic->ic_bsschan && (ic->ic_bsschan != IEEE80211_CHAN_ANYC))
-+		power = min(power, ic->ic_bsschan->ic_maxpower);
++		power = min(power, (u_int16_t) ic->ic_bsschan->ic_maxpower);
 +
  	/* txpower (128 values, but will print out only IW_MAX_TXPOWER) */
 -	range->num_txpower = (ic->ic_txpowlimit >= 8) ? IW_MAX_TXPOWER : ic->ic_txpowlimit;
@@ -79,8 +79,12 @@
  			- (IW_MAX_TXPOWER - i - 1) * step;
  
  	range->txpower_capa = IW_TXPOW_DBM;
-@@ -1382,10 +1388,8 @@ ieee80211_ioctl_siwtxpow(struct net_devi
- 	disabled = (fixed && vap->iv_bss->ni_txpower == 0);
+@@ -1379,13 +1385,11 @@ ieee80211_ioctl_siwtxpow(struct net_devi
+ 	int fixed, disabled;
+ 
+ 	fixed = (ic->ic_flags & IEEE80211_F_TXPOW_FIXED);
+-	disabled = (fixed && vap->iv_bss->ni_txpower == 0);
++	disabled = (fixed && ic->ic_txpowlimit == 0);
  	if (rrq->disabled) {
  		if (!disabled) {
 -			if ((ic->ic_caps & IEEE80211_C_TXPMGT) == 0)
@@ -136,8 +140,8 @@
 +	struct ieee80211_channel *c;
 +	u_int16_t txp = ic->ic_max_txpower;
 +
-+	if (ic->ic_bsschan && (ic->ic_bsschan != IEEE80211_CHAN_ANYC))
-+		txp = min(txp, 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) {
 +		txp = min(txp, ic->ic_cur_txpower);
 +	}