diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-05-28 13:01:53 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-29 09:11:56 +0200 |
| commit | 31eba5bc56a9324f056d28569a4f89f39c1c3f70 (patch) | |
| tree | b070a7f1871763d66562678ff23daa4613a3eab9 /net/mac80211/driver-ops.h | |
| parent | e057d3c31bdf87616b415c4b2cbf7310f54b9219 (diff) | |
| download | lwn-31eba5bc56a9324f056d28569a4f89f39c1c3f70.tar.gz lwn-31eba5bc56a9324f056d28569a4f89f39c1c3f70.zip | |
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/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 169664c122e2..b931c96a596f 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -146,7 +146,8 @@ static inline int drv_add_interface(struct ieee80211_local *local, if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN || (sdata->vif.type == NL80211_IFTYPE_MONITOR && - !(local->hw.flags & IEEE80211_HW_WANT_MONITOR_VIF)))) + !(local->hw.flags & IEEE80211_HW_WANT_MONITOR_VIF) && + !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE)))) return -EINVAL; trace_drv_add_interface(local, sdata); |