oops. committed an old version of the patch

[openwrt/svn-archive/archive.git] / package / madwifi / patches / 414-txpower.patch

diff --git a/package/madwifi/patches/414-txpower.patch b/package/madwifi/patches/414-txpower.patch
index 3e7e315d11b4569d6af684b8e84b74a94dc0f701..9d9e60b2e8c5ff5a76250dc57d03b940b92279fc 100644 (file)
--- 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);
 +      }