summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorAntonio Quartulli2012-11-30 00:18:12 +0100
committerJohannes Berg2012-11-30 13:39:05 +0100
commit41e31b8b902397d5d507b275050fcbe8adaf4ff4 (patch)
tree603a8600f8023b1e5852b2fb8bdb39e890831793 /net/mac80211
parentmac80211: fix for mesh sync to indicate TBTT adjustment (diff)
downloadkernel-qcow2-linux-41e31b8b902397d5d507b275050fcbe8adaf4ff4.tar.gz
kernel-qcow2-linux-41e31b8b902397d5d507b275050fcbe8adaf4ff4.tar.xz
kernel-qcow2-linux-41e31b8b902397d5d507b275050fcbe8adaf4ff4.zip
mac80211: allow userspace registration for probe requests in IBSS
This change allows userspace to register for probe request frames on an IBSS interface. Userspace then has to handle them and send replies. Signed-off-by: Antonio Quartulli <antonio@open-mesh.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index c4ed83b74e52..4ece42ca87bb 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -474,7 +474,8 @@ ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
.tx = 0xffff,
.rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
BIT(IEEE80211_STYPE_AUTH >> 4) |
- BIT(IEEE80211_STYPE_DEAUTH >> 4),
+ BIT(IEEE80211_STYPE_DEAUTH >> 4) |
+ BIT(IEEE80211_STYPE_PROBE_REQ >> 4),
},
[NL80211_IFTYPE_STATION] = {
.tx = 0xffff,