p2p filter improvements
Subsystems (2)
Johannes Berg
maintainercover p2p filter improvements
This is necessary for some devices to allow
p2p probe requests to be received.
johannes
Johannes Berg
maintainerPATCH 1/2 cfg80211: notify drivers about frame registrations
From: Johannes Berg <[email protected]>
Drivers may need to adjust their filters according to frame registrations, so notify them about them.
Signed-off-by Johannes Berg <[email protected]>
--- include/net/cfg80211.h | 7 +++++++ net/wireless/mlme.c | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-)
include/net/cfg80211.h +7 -0
@@ -1147,6 +1147,9 @@ struct cfg80211_pmksa {* allows the driver to adjust the dynamic ps timeout value. * @set_cqm_rssi_config: Configure connection quality monitor RSSI threshold. * +* @mgmt_frame_register: Notify driver that a management frame type was +* registered. Note that this callback may not sleep, and cannot run +* concurrently with itself. */ struct cfg80211_ops {int (*suspend)(struct wiphy *wiphy);
@@ -1297,6 +1300,10 @@ struct cfg80211_ops {int (*set_cqm_rssi_config)(struct wiphy *wiphy,struct net_device *dev,s32 rssi_thold,u32 rssi_hyst); + +void (*mgmt_frame_register)(struct wiphy *wiphy, +struct net_device *dev, +u16 frame_type,bool reg); };/*
net/wireless/mlme.c +20 -3
@@ -764,6 +764,8 @@ int cfg80211_mlme_register_mgmt(struct w u16 frame_type, const u8 *match_data, int match_len) { + struct wiphy *wiphy = wdev->wiphy; +struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy);struct cfg80211_mgmt_registration *reg, *nreg;int err =0 ;u16 mgmt_type;
@@ -810,22 +812,37 @@ int cfg80211_mlme_register_mgmt(struct w nreg->frame_type =cpu_to_le16 (frame_type);list_add (&nreg->list, &wdev->mgmt_registrations); +if (rdev->ops->mgmt_frame_register) + rdev->ops->mgmt_frame_register (wiphy, wdev->netdev, + frame_type, true); + out:spin_unlock_bh (&wdev->mgmt_registrations_lock); +return err; }void cfg80211_mlme_unregister_socket (struct wireless_dev *wdev,u32 nlpid) { +struct wiphy *wiphy = wdev->wiphy; +struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy);struct cfg80211_mgmt_registration *reg, *tmp;spin_lock_bh (&wdev->mgmt_registrations_lock);list_for_each_entry_safe (reg, tmp, &wdev->mgmt_registrations, list) { -if (reg->nlpid == nlpid) { -list_del (®->list); -kfree (reg); +if (reg->nlpid != nlpid) +continue ; + +if (rdev->ops->mgmt_frame_register) { +u16 frame_type =le16_to_cpu (reg->frame_type); + + rdev->ops->mgmt_frame_register (wiphy, wdev->netdev, + frame_type, false); } + +list_del (®->list); +kfree (reg); }spin_unlock_bh (&wdev->mgmt_registrations_lock);
Johannes Berg
maintainerPATCH 2/2 mac80211: add probe request filter flag
In reply to Johannes BergFrom: Johannes Berg <[email protected]>
Using the frame registration notification, we can see when probe requests are requested and notify the low-level driver via filtering. The flag is also set in AP and IBSS modes.
Signed-off-by Johannes Berg <[email protected]>
--- include/net/mac80211.h | 9 ++++++--- net/mac80211/cfg.c | 18 ++++++++++++++++++ net/mac80211/ieee80211_i.h | 4 +++- net/mac80211/iface.c | 9 ++++++++- net/mac80211/main.c | 3 +++ 5 files changed, 38 insertions(+), 5 deletions(-)
include/net/mac80211.h +6 -3
@@ -1478,12 +1478,14 @@ ieee80211_get_alt_retry_rate(const struc* honour this flag if possible. * * @FIF_CONTROL: pass control frames (except for PS Poll), if PROMISC_IN_BSS -* is not set then only those addressed to this station. +* is not set then only those addressed to this station. * * @FIF_OTHER_BSS: pass frames destined to other BSSes * -* @FIF_PSPOLL: pass PS Poll frames, if PROMISC_IN_BSS is not set then only -* those addressed to this station. +* @FIF_PSPOLL: pass PS Poll frames, if PROMISC_IN_BSS is not set then only +* those addressed to this station. +* +* @FIF_PROBE_REQ: pass probe request frames */ enum ieee80211_filter_flags {FIF_PROMISC_IN_BSS =1 <<0 ,
@@ -1494,6 +1496,7 @@ enum ieee80211_filter_flags {FIF_CONTROL =1 <<5 ,FIF_OTHER_BSS =1 <<6 ,FIF_PSPOLL =1 <<7 , + FIF_PROBE_REQ = 1<<8, };/**
net/mac80211/main.c +3 -0
@@ -54,6 +54,9 @@ void ieee80211_configure_filter(struct iif (local->monitors || local->scanning) new_flags |=FIF_BCN_PRBRESP_PROMISC ; +if (local->fif_probe_req || local->probe_req_reg) + new_flags |=FIF_PROBE_REQ ; +if (local->fif_fcsfail) new_flags |=FIF_FCSFAIL ;
net/mac80211/cfg.c +18 -0
@@ -1604,6 +1604,23 @@ static int ieee80211_mgmt_tx(struct wiphreturn 0 ; } +static void ieee80211_mgmt_frame_register (struct wiphy *wiphy, +struct net_device *dev, +u16 frame_type,bool reg) +{ +struct ieee80211_local *local =wiphy_priv (wiphy); + +if (frame_type != (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_PROBE_REQ )) +return ; + +if (reg) + local->probe_req_reg++; +else + local->probe_req_reg--; + +ieee80211_queue_work (&local->hw, &local->reconfig_filter); +} +struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -1655,4 +1672,5 @@ struct cfg80211_ops mac80211_config_ops .cancel_remain_on_channel = ieee80211_cancel_remain_on_channel, .mgmt_tx = ieee80211_mgmt_tx, .set_cqm_rssi_config = ieee80211_set_cqm_rssi_config, + .mgmt_frame_register = ieee80211_mgmt_frame_register, };
net/mac80211/ieee80211_i.h +3 -1
@@ -707,7 +707,9 @@ struct ieee80211_local {int open_count;int monitors, cooked_mntrs;/* number of interfaces with corresponding FIF_ flags */ -int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; +int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll, + fif_probe_req; +int probe_req_reg;unsigned int filter_flags;/* FIF_* */ bool wiphy_ciphers_allocated;
net/mac80211/iface.c +8 -1
@@ -280,8 +280,11 @@ static int ieee80211_do_open(struct net_ieee80211_start_mesh (sdata); }else if (sdata->vif.type ==NL80211_IFTYPE_AP ) { local->fif_pspoll++; + local->fif_probe_req++;ieee80211_configure_filter (local); + }else if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) { + local->fif_probe_req++; } changed |=ieee80211_reset_erp_info (sdata);
@@ -428,8 +431,12 @@ static void ieee80211_do_stop(struct ieeif (sdata->flags &IEEE80211_SDATA_PROMISC )atomic_dec (&local->iff_promiscs); -if (sdata->vif.type ==NL80211_IFTYPE_AP ) +if (sdata->vif.type ==NL80211_IFTYPE_AP ) { local->fif_pspoll--; + local->fif_probe_req--; + }else if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) { + local->fif_probe_req--; + }netif_addr_lock_bh (sdata->dev);spin_lock_bh (&local->filter_lock);