diff options
| author | Andrei Otcheretianski <andrei.otcheretianski@intel.com> | 2015-08-15 22:39:50 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-09-22 15:21:22 +0200 |
| commit | 1b09b5568e5f46c6dfb781d7c1dfad431a6d8ec1 (patch) | |
| tree | 1e437f5a6693228d1d5d4f122d0ef0ad99edc734 /net/mac80211/cfg.c | |
| parent | 7bdbe400d1b2aac116513f90b75969ad2365fba6 (diff) | |
| download | linux-1b09b5568e5f46c6dfb781d7c1dfad431a6d8ec1.tar.gz linux-1b09b5568e5f46c6dfb781d7c1dfad431a6d8ec1.tar.bz2 linux-1b09b5568e5f46c6dfb781d7c1dfad431a6d8ec1.zip | |
mac80211: introduce per vif frame registration API
Currently the cfg80211's frame registration api receives wdev, however
mac80211 assumes per device filter configuration and ignores wdev.
Per device filtering is too wasteful, especially for multi-channel
devices.
Introduce new per vif frame registration API and use it for probe
request registrations in ieee80211_mgmt_frame_register()
Also call directly to ieee80211_configure_filter instead of using a work
since it is now allowed to sleep in ieee80211_mgmt_frame_register.
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 1ca972e5418b..9eab783701aa 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3516,18 +3516,32 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, u16 frame_type, bool reg) { struct ieee80211_local *local = wiphy_priv(wiphy); + struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); switch (frame_type) { case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ: - if (reg) + if (reg) { local->probe_req_reg++; - else - local->probe_req_reg--; + sdata->vif.probe_req_reg++; + } else { + if (local->probe_req_reg) + local->probe_req_reg--; + + if (sdata->vif.probe_req_reg) + sdata->vif.probe_req_reg--; + } if (!local->open_count) break; - ieee80211_queue_work(&local->hw, &local->reconfig_filter); + if (sdata->vif.probe_req_reg == 1) + drv_config_iface_filter(local, sdata, FIF_PROBE_REQ, + FIF_PROBE_REQ); + else if (sdata->vif.probe_req_reg == 0) + drv_config_iface_filter(local, sdata, 0, + FIF_PROBE_REQ); + + ieee80211_configure_filter(local); break; default: break; |