diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-19 02:29:08 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-19 02:29:08 (GMT) |
| commit | c13ed534b8db543e4d8ead3885f4b06585a5771c (patch) | |
| tree | b371024a63efe057e0bed95fc5ed77900b113e7d /net/mac80211/util.c | |
| parent | 22da73492541736eff5f6a6634c732e36c52a133 (diff) | |
| parent | fbd05e4a6e82fd573d3aa79e284e424b8d78c149 (diff) | |
| download | linux-c13ed534b8db543e4d8ead3885f4b06585a5771c.tar.xz | |
Merge tag 'mac80211-next-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
This time we have various things - all across the board:
* MU-MIMO sniffer support in mac80211
* a create_singlethread_workqueue() cleanup
* interface dump filtering that was documented but not implemented
* support for the new radiotap timestamp field
* send delBA in two unexpected conditions (as required by the spec)
* connect keys cleanups - allow only WEP with index 0-3
* per-station aggregation limit to work around broken APs
* debugfs improvement for the integrated codel algorithm
and various other small improvements and cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 42bf0b6..b6865d8 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -598,7 +598,7 @@ static void __iterate_interfaces(struct ieee80211_local *local, list_for_each_entry_rcu(sdata, &local->interfaces, list) { switch (sdata->vif.type) { case NL80211_IFTYPE_MONITOR: - if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE)) + if (!(sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE)) continue; break; case NL80211_IFTYPE_AP_VLAN: @@ -2555,7 +2555,6 @@ int ieee80211_add_srates_ie(struct ieee80211_sub_if_data *sdata, if (need_basic && basic_rates & BIT(i)) basic = 0x80; - rate = sband->bitrates[i].bitrate; rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, 5 * (1 << shift)); *pos++ = basic | (u8) rate; |