From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 20 Sep 2011 10:42:45 +0000 (+0000)
Subject: ath9k: fix antenna gain calculation
X-Git-Tag: reboot~15914
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6848e9c830e0f9e532f86c2ae078350e11426c34;p=openwrt%2Fstaging%2Fxback.git

ath9k: fix antenna gain calculation

SVN-Revision: 28261
---

diff --git a/package/mac80211/patches/581-ath9k_cleanup_txpower_handling.patch b/package/mac80211/patches/581-ath9k_cleanup_txpower_handling.patch
index 4978ba1302..029ce3d7af 100644
--- a/package/mac80211/patches/581-ath9k_cleanup_txpower_handling.patch
+++ b/package/mac80211/patches/581-ath9k_cleanup_txpower_handling.patch
@@ -155,7 +155,7 @@
 +	channel = chan->chan;
 +	chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
 +	new_pwr = min_t(int, chan_pwr, reg->power_limit);
-+	max_gain = new_pwr - chan_pwr + channel->max_antenna_gain * 2;
++	max_gain = chan_pwr - new_pwr + channel->max_antenna_gain * 2;
 +
 +	ant_gain = get_antenna_gain(ah, chan);
 +	if (ant_gain > max_gain)
@@ -175,7 +175,7 @@
 -	int reg_pwr = min_t(int, MAX_RATE_POWER, limit);
 -	int chan_pwr = channel->max_power * 2;
  
-+	reg->power_limit = min_t(int, limit * 2, MAX_RATE_POWER);
++	reg->power_limit = min_t(int, limit, MAX_RATE_POWER);
  	if (test)
 -		reg_pwr = chan_pwr = MAX_RATE_POWER;
 +		channel->max_power = MAX_RATE_POWER / 2;