From c62b68a939a4fbb05f7caad27ee754fa513d071e Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Thu, 7 Apr 2011 15:08:31 -0700
Subject: [PATCH] --- yaml --- r: 246807 b: refs/heads/master c:
 71839121a0f35f9968d2e204a76eb22683156fd8 h: refs/heads/master i:   246805:
 a5aed7fc4577557ac802f92cdd3788230c789c40   246803:
 d5389423617ea0eeb8ea8806a117b7548c4029cb   246799:
 643b15f890005a89b9821f18b47b01403e1d7c2e v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 4 +++-
 trunk/net/mac80211/rx.c   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 00279103a4c4..fb659aa44dd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b39c48fac1fc915a5dcd024bf6e9aabc855ed591
+refs/heads/master: 71839121a0f35f9968d2e204a76eb22683156fd8
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index dc50fc3153e5..e2db3dc23953 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/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/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index fc2ff78582ca..359fc394a3b0 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/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;