From: Thomas Pedersen <thomas@cozybit.com>
To: linux-wireless@vger.kernel.org
Cc: javier@cozybit.com, johannes@sipsolutions.net, linville@tuxdriver.com
Subject: [PATCH v6 05/10] mac80211: Let user space receive and send mesh auth/deauth frames
Date: Fri, 1 Apr 2011 13:35:46 -0700 [thread overview]
Message-ID: <1301690151-14979-6-git-send-email-thomas@cozybit.com> (raw)
In-Reply-To: <1301690151-14979-1-git-send-email-thomas@cozybit.com>
From: Javier Cardona <javier@cozybit.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
---
net/mac80211/main.c | 4 +++-
net/mac80211/rx.c | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 562d298..0ae9b22 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -545,7 +545,9 @@ ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
},
[NL80211_IFTYPE_MESH_POINT] = {
.tx = 0xffff,
- .rx = BIT(IEEE80211_STYPE_ACTION >> 4),
+ .rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
+ BIT(IEEE80211_STYPE_AUTH >> 4) |
+ BIT(IEEE80211_STYPE_DEAUTH >> 4),
},
};
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5c1930b..fe0f1e3 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -502,7 +502,8 @@ ieee80211_rx_mesh_check(struct ieee80211_rx_data *rx)
if (ieee80211_is_probe_req(hdr->frame_control) ||
ieee80211_is_probe_resp(hdr->frame_control) ||
- ieee80211_is_beacon(hdr->frame_control))
+ ieee80211_is_beacon(hdr->frame_control) ||
+ ieee80211_is_auth(hdr->frame_control))
return RX_CONTINUE;
return RX_DROP_MONITOR;
--
1.7.4.1
next prev parent reply other threads:[~2011-04-01 21:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-01 20:35 [PATCH v6 00/10] {mac|nl}80211: mesh security enhancements Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 01/10] nl80211: rename NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 02/10] nl80211: Add userspace authentication flag to mesh setup Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 03/10] mac80211: ignore peers if security is enabled for this mesh Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 04/10] nl80211: let userspace authenticate stations Thomas Pedersen
2011-04-01 20:35 ` Thomas Pedersen [this message]
2011-04-01 20:35 ` [PATCH v6 06/10] mac80211: ignore peer link requests from unauthenticated stations Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 07/10] mac80211: Perform PLINK_ACTION on new station Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 08/10] nl80211: New notification to discover mesh peer candidates Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 09/10] mac80211: send notification on new peer candidate for our secure mesh Thomas Pedersen
2011-04-01 20:35 ` [PATCH v6 10/10] nl80211: report mesh capabilities Thomas Pedersen
2011-04-04 12:20 ` Johannes Berg
2011-04-04 12:21 ` [PATCH v6 00/10] {mac|nl}80211: mesh security enhancements Johannes Berg
2011-04-04 20:38 ` Thomas Pedersen
2011-04-04 20:44 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1301690151-14979-6-git-send-email-thomas@cozybit.com \
--to=thomas@cozybit.com \
--cc=javier@cozybit.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).