From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 25 Mar 2009 01:51:49 +0000 (+0000)
Subject: oops. committed an old version of the patch
X-Git-Tag: reboot~24089
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=25cf1bc5e4cf089158ca9a7a9e2a4d7ee3781953

oops. committed an old version of the patch

SVN-Revision: 15033
---

diff --git a/package/madwifi/patches/414-txpower.patch b/package/madwifi/patches/414-txpower.patch
index 3e7e315d11..9d9e60b2e8 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;
@@ -136,8 +136,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);
 +	}