mac80211: exclude AP_VLAN interfaces from tx power calculation
authorFelix Fietkau <nbd@openwrt.org>
Thu, 10 Apr 2014 13:06:48 +0000 (15:06 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 11 Apr 2014 07:37:41 +0000 (09:37 +0200)
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>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/main.c

index 4172d4253197a77212c76e930d0f2a437c8ea973..4c1bf61bc778683dc352ebb32a585d45649168a6 100644 (file)
@@ -148,6 +148,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
        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();