---

yaml --- r: 314831 b: refs/heads/master c: 3bfda62 h: refs/heads/master i: 314829: 034a873 314827: faa441a 314823: a3a2dc9 314815: 4b696df v: v3
git-mirror · Jun 20, 2012 · 5f60a1c · 5f60a1c
1 parent 9203adb
commit 5f60a1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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,