diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-08 09:38:32 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-08 09:38:32 +0000 |
| commit | 79dd82690b49f562fead1236828952a4ff55b19e (patch) | |
| tree | 8d99340add217d9831810232b418635ccfaf8287 /package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch | |
| parent | c3e1e1cb2f09ebc8c35455f2ff77061f937dfb05 (diff) | |
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37918 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch b/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch index ea28fa4bb1..dd1fec7ee1 100644 --- a/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch +++ b/package/kernel/mac80211/patches/524-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 -@@ -2848,7 +2848,7 @@ void ath9k_hw_apply_txpower(struct ath_h +@@ -2856,7 +2856,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 -@@ -1303,7 +1303,10 @@ int ath9k_config(struct ieee80211_hw *hw +@@ -1297,7 +1297,10 @@ int ath9k_config(struct ieee80211_hw *hw } if (changed & IEEE80211_CONF_CHANGE_POWER) { |