From 6fdbeaba9486e83c7f2c67d1cafa9d612615c41d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 29 Jan 2013 11:41:38 +0100
Subject: [PATCH] --- yaml --- r: 352551 b: refs/heads/master c:
 e54faf29e07b6cc28a44a4f01d7fbc40905a67d3 h: refs/heads/master i:   352549:
 b3b89e523240f498a41aafa6e444049bf6e183ce   352547:
 190a8916e0e89f8614724f8230658401011c1bde   352543:
 67c57d8f680fc0b10085e95d24c7fdc552c0e4a6 v: v3

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

diff --git a/[refs] b/[refs]
index 9fbe8ce25c76..edcbc8c081c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ca813ad61136896c91a40194452ff665a522711
+refs/heads/master: e54faf29e07b6cc28a44a4f01d7fbc40905a67d3
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index a2cb6a302cc7..7892b0a8873e 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -594,7 +594,8 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 			break;
 		}
 
-		if (unlikely(tx->key && tx->key->flags & KEY_FLAG_TAINTED))
+		if (unlikely(tx->key && tx->key->flags & KEY_FLAG_TAINTED &&
+			     !ieee80211_is_deauth(hdr->frame_control)))
 			return TX_DROP;
 
 		if (!skip_hw && tx->key &&