From 63883273cce68e75c11b1fa2b297102ada8a9a1e Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 17 Jan 2010 01:47:57 +0100
Subject: [PATCH] --- yaml --- r: 183845 b: refs/heads/master c:
 a6bae9e7ab19876a157c91019852395539e4f20e h: refs/heads/master i:   183843:
 30ff0cf1308a5a6ea5454ff9a4837d529e5d9d97 v: v3

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

diff --git a/[refs] b/[refs]
index e89b41c02524..ab9d21a3c66d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 697e6a0fb0c8783695d4b4a5d7131476b296d623
+refs/heads/master: a6bae9e7ab19876a157c91019852395539e4f20e
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index a74ab797fed9..9afbee0d53c0 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -553,9 +553,6 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 		}
 	}
 
-	if (!tx->key || !(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
-		info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
-
 	return TX_CONTINUE;
 }