diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-05-28 07:01:53 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-29 03:11:56 -0400 |
commit | 31eba5bc56a9324f056d28569a4f89f39c1c3f70 (patch) | |
tree | b070a7f1871763d66562678ff23daa4613a3eab9 /net/mac80211/util.c | |
parent | e057d3c31bdf87616b415c4b2cbf7310f54b9219 (diff) |
mac80211: support active monitor interfaces
Support them only if the driver advertises support for them via
IEEE80211_HW_SUPPORTS_ACTIVE_MONITOR. Unlike normal monitor interfaces,
they are added to the driver, along with their MAC address.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 2a8d759324c2..89a83770d152 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -560,6 +560,9 @@ void ieee80211_iterate_active_interfaces( | |||
560 | list_for_each_entry(sdata, &local->interfaces, list) { | 560 | list_for_each_entry(sdata, &local->interfaces, list) { |
561 | switch (sdata->vif.type) { | 561 | switch (sdata->vif.type) { |
562 | case NL80211_IFTYPE_MONITOR: | 562 | case NL80211_IFTYPE_MONITOR: |
563 | if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE)) | ||
564 | continue; | ||
565 | break; | ||
563 | case NL80211_IFTYPE_AP_VLAN: | 566 | case NL80211_IFTYPE_AP_VLAN: |
564 | continue; | 567 | continue; |
565 | default: | 568 | default: |
@@ -598,6 +601,9 @@ void ieee80211_iterate_active_interfaces_atomic( | |||
598 | list_for_each_entry_rcu(sdata, &local->interfaces, list) { | 601 | list_for_each_entry_rcu(sdata, &local->interfaces, list) { |
599 | switch (sdata->vif.type) { | 602 | switch (sdata->vif.type) { |
600 | case NL80211_IFTYPE_MONITOR: | 603 | case NL80211_IFTYPE_MONITOR: |
604 | if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE)) | ||
605 | continue; | ||
606 | break; | ||
601 | case NL80211_IFTYPE_AP_VLAN: | 607 | case NL80211_IFTYPE_AP_VLAN: |
602 | continue; | 608 | continue; |
603 | default: | 609 | default: |