diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
commit | 6f5a0548e77a502b10f25f5b99eebb7645fdddfe (patch) | |
tree | 85d832cbeb8505f2dd56c9fddfd89a00e0e86aef /package/kernel/mac80211/patches/523-ath9k_use_configured_antenna_gain.patch | |
parent | 86e335120ad5f245b79604252cdae0a156dd1f8c (diff) | |
download | upstream-6f5a0548e77a502b10f25f5b99eebb7645fdddfe.tar.gz upstream-6f5a0548e77a502b10f25f5b99eebb7645fdddfe.tar.bz2 upstream-6f5a0548e77a502b10f25f5b99eebb7645fdddfe.zip |
ath9k: merge another round of upstream (or -pending) fixes and cleanups
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39138 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/523-ath9k_use_configured_antenna_gain.patch')
-rw-r--r-- | package/kernel/mac80211/patches/523-ath9k_use_configured_antenna_gain.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/523-ath9k_use_configured_antenna_gain.patch b/package/kernel/mac80211/patches/523-ath9k_use_configured_antenna_gain.patch index afc5ba64c1..f960519dd8 100644 --- a/package/kernel/mac80211/patches/523-ath9k_use_configured_antenna_gain.patch +++ b/package/kernel/mac80211/patches/523-ath9k_use_configured_antenna_gain.patch @@ -10,7 +10,7 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2841,7 +2841,7 @@ void ath9k_hw_apply_txpower(struct ath_h +@@ -2809,7 +2809,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); @@ -21,7 +21,7 @@ if (ant_gain > max_gain) --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1345,7 +1345,10 @@ static int ath9k_config(struct ieee80211 +@@ -1347,7 +1347,10 @@ static int ath9k_config(struct ieee80211 } if (changed & IEEE80211_CONF_CHANGE_POWER) { |