diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-04-10 08:52:33 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-04-10 08:52:33 +0000 |
commit | 1d5076d98dfd6a5f31ddf9d4f26f1d876c624ef9 (patch) | |
tree | 913bd70ded2e0808e03775dde56400a6dff6a32f /package/kernel/mac80211/patches/300-pending_work.patch | |
parent | c34f225392c225355a3883989c02f3a3d623f8ce (diff) | |
download | master-187ad058-1d5076d98dfd6a5f31ddf9d4f26f1d876c624ef9.tar.gz master-187ad058-1d5076d98dfd6a5f31ddf9d4f26f1d876c624ef9.tar.bz2 master-187ad058-1d5076d98dfd6a5f31ddf9d4f26f1d876c624ef9.zip |
mac80211: add back missing tx power handling fix (#12750)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40440 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/300-pending_work.patch')
-rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch index 234006355b..71f2af379b 100644 --- a/package/kernel/mac80211/patches/300-pending_work.patch +++ b/package/kernel/mac80211/patches/300-pending_work.patch @@ -1,3 +1,16 @@ +commit 7cbb4c021bfd1e656f5b9953a947ab3c64e4e3b0 +Author: Felix Fietkau <nbd@openwrt.org> +Date: Thu Apr 10 10:49:01 2014 +0200 + + mac80211: exclude AP_VLAN interfaces from tx power calculation + + Their power value is initialized to zero. This patch fixes an issue + where the configured power drops to the minimum value when AP_VLAN + interfaces are created/removed. + + Cc: stable@vger.kernel.org + Signed-off-by: Felix Fietkau <nbd@openwrt.org> + commit 0ca13e26341733bf9577287fb04a3bef0d2f5cc9 Author: Felix Fietkau <nbd@openwrt.org> Date: Wed Apr 9 00:07:01 2014 +0200 @@ -67,7 +80,16 @@ Date: Sun Apr 6 23:35:28 2014 +0200 void ath9k_beacon_tasklet(unsigned long data) --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -203,7 +203,7 @@ void ieee80211_bss_info_change_notify(st +@@ -152,6 +152,8 @@ static u32 ieee80211_hw_conf_chan(struct + list_for_each_entry_rcu(sdata, &local->interfaces, list) { + if (!rcu_access_pointer(sdata->vif.chanctx_conf)) + continue; ++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) ++ continue; + power = min(power, sdata->vif.bss_conf.txpower); + } + rcu_read_unlock(); +@@ -203,7 +205,7 @@ void ieee80211_bss_info_change_notify(st { struct ieee80211_local *local = sdata->local; |