summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-02-29 14:53:21 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-29 14:53:21 -0500
commit8701ff0a88bcfc8c7dced3842919ad8d016a6835 (patch)
treeba71774b83e92d6507a398024a6d89b146181320 /net/mac80211
parentf4fb4b212d2668f831918023bc3ca451997faee6 (diff)
parent00f157b49780e194c38dafdf9df8e10b8a6a9626 (diff)
downloadop-kernel-dev-8701ff0a88bcfc8c7dced3842919ad8d016a6835.zip
op-kernel-dev-8701ff0a88bcfc8c7dced3842919ad8d016a6835.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/iface.c3
-rw-r--r--net/mac80211/rate.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 60b240c..620ca8d 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1344,6 +1344,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
hw_roc = true;
list_for_each_entry(sdata, &local->interfaces, list) {
+ if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||
+ sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+ continue;
if (sdata->old_idle == sdata->vif.bss_conf.idle)
continue;
if (!ieee80211_sdata_running(sdata))
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 111fba3..b4f7600 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -447,7 +447,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
info->control.rates[i].idx = -1;
info->control.rates[i].flags = 0;
- info->control.rates[i].count = 1;
+ info->control.rates[i].count = 0;
}
if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
OpenPOWER on IntegriCloud