diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
commit | 6716ba9aadc93b2858ab800a84cb4335c92324ff (patch) | |
tree | 8f8fbea06486b2e23eb4be46d92b4b0f121e831c /package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch | |
parent | 3365e2caf014e24ff8ea091a3d93cb89f330b70b (diff) | |
download | master-31e0f0ae-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.gz master-31e0f0ae-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.bz2 master-31e0f0ae-6716ba9aadc93b2858ab800a84cb4335c92324ff.zip |
mac80211: update to wireless-testing 2012-12-06
SVN-Revision: 34571
Diffstat (limited to 'package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch')
-rw-r--r-- | package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch b/package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch new file mode 100644 index 0000000000..1315c7100d --- /dev/null +++ b/package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch @@ -0,0 +1,34 @@ +--- a/drivers/net/wireless/ath/ath.h ++++ b/drivers/net/wireless/ath/ath.h +@@ -73,6 +73,7 @@ struct ath_regulatory { + u16 max_power_level; + u16 current_rd; + int16_t power_limit; ++ int16_t max_antenna_gain; + struct reg_dmn_pair_mapping *regpair; + }; + +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -2836,7 +2836,7 @@ void ath9k_hw_apply_txpower(struct ath_h + 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 = chan_pwr - new_pwr + channel->max_antenna_gain * 2; ++ max_gain = chan_pwr - new_pwr + reg->max_antenna_gain * 2; + + ant_gain = get_antenna_gain(ah, chan); + if (ant_gain > max_gain) +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -1211,7 +1211,10 @@ int ath9k_config(struct ieee80211_hw *hw + } + + if (changed & IEEE80211_CONF_CHANGE_POWER) { ++ struct ath_regulatory *reg = ath9k_hw_regulatory(ah); ++ + ath_dbg(common, CONFIG, "Set power: %d\n", conf->power_level); ++ reg->max_antenna_gain = conf->max_antenna_gain; + sc->config.txpowlimit = 2 * conf->power_level; + ath9k_cmn_update_txpow(ah, sc->curtxpow, + sc->config.txpowlimit, &sc->curtxpow); |