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 &&