diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-02-29 14:53:21 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 14:53:21 -0500 |
| commit | 8701ff0a88bcfc8c7dced3842919ad8d016a6835 (patch) | |
| tree | ba71774b83e92d6507a398024a6d89b146181320 /net | |
| parent | ath9k: decouple RX error checking for DFS (diff) | |
| parent | mwifiex: reset encryption mode flag before association (diff) | |
| download | linux-dev-8701ff0a88bcfc8c7dced3842919ad8d016a6835.tar.xz linux-dev-8701ff0a88bcfc8c7dced3842919ad8d016a6835.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/iface.c | 3 | ||||
| -rw-r--r-- | net/mac80211/rate.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 60b240ce709e..620ca8d2ad42 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 111fba38be82..b4f7600a3e36 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) |