From 5f60a1c6fbb947a377c206fdb4925fd1ce3f7877 Mon Sep 17 00:00:00 2001
From: Will Hawkins <hawkinsw@opentechinstitute.org>
Date: Tue, 19 Jun 2012 17:59:14 -0400
Subject: [PATCH] --- yaml --- r: 314831 b: refs/heads/master c:
 3bfda62c50b0a4b118dcfce36686508ca2892292 h: refs/heads/master i:   314829:
 034a873c4be66601c991c7fb87821ec2662bddb5   314827:
 faa441a59538681d93c1cf8b828c30fa9ad7a682   314823:
 a3a2dc928fedf310d65ccc7babc1157661a55009   314815:
 4b696df2d85e28456058c983e686d04840edebd5 v: v3

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

diff --git a/[refs] b/[refs]
index 96ff19737795..eecc6b536995 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 452a6d22615bb8262a932b362f41fc5d89f03293
+refs/heads/master: 3bfda62c50b0a4b118dcfce36686508ca2892292
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index 976e41365c25..0b040fb73673 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -462,7 +462,9 @@ static const struct ieee80211_txrx_stypes
 ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
 	[NL80211_IFTYPE_ADHOC] = {
 		.tx = 0xffff,
-		.rx = BIT(IEEE80211_STYPE_ACTION >> 4),
+		.rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
+			BIT(IEEE80211_STYPE_AUTH >> 4) |
+			BIT(IEEE80211_STYPE_DEAUTH >> 4),
 	},
 	[NL80211_IFTYPE_STATION] = {
 		.tx = 0xffff,