diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-04-08 22:11:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-04-08 22:11:23 +0000 |
| commit | 4012b63ad34b63d80affb94ffd6a65f877b3f3d3 (patch) | |
| tree | 16e6b72fbc7e8e97cd553066ac10f5dfd871e5d3 /package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | |
| parent | 2d7b490808d380febb9546f7d72c8196f7d9c022 (diff) | |
| download | upstream-4012b63ad34b63d80affb94ffd6a65f877b3f3d3.tar.gz upstream-4012b63ad34b63d80affb94ffd6a65f877b3f3d3.tar.bz2 upstream-4012b63ad34b63d80affb94ffd6a65f877b3f3d3.zip | |
mac80211: fix user antenna gain calculation
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40429 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch index f131f56c1e..c94c1e1114 100644 --- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch @@ -102,34 +102,24 @@ struct cfg80211_chan_def chandef = {}; u32 changed = 0; - int power; -+ int power, ant_gain, max_power; ++ int power, max_power; u32 offchannel_flag; offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL; -@@ -156,8 +156,21 @@ static u32 ieee80211_hw_conf_chan(struct +@@ -156,6 +156,12 @@ static u32 ieee80211_hw_conf_chan(struct } rcu_read_unlock(); -- if (local->hw.conf.power_level != power) { + max_power = chandef.chan->max_reg_power; -+ ant_gain = chandef.chan->max_antenna_gain; + if (local->user_antenna_gain > 0) { -+ if (local->user_antenna_gain > ant_gain) { -+ max_power -= local->user_antenna_gain - ant_gain; -+ ant_gain = 0; -+ } else -+ ant_gain -= local->user_antenna_gain; ++ max_power -= local->user_antenna_gain; + power = min(power, max_power); + } + -+ if (local->hw.conf.power_level != power || -+ local->hw.conf.max_antenna_gain != ant_gain) { + if (local->hw.conf.power_level != power) { changed |= IEEE80211_CONF_CHANGE_POWER; -+ local->hw.conf.max_antenna_gain = ant_gain; local->hw.cur_power_level = power; - local->hw.conf.power_level = power; - } -@@ -584,6 +597,7 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -584,6 +590,7 @@ struct ieee80211_hw *ieee80211_alloc_hw( IEEE80211_RADIOTAP_MCS_HAVE_BW; local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI | IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH; |