From 4e482dab1e6112512f44bd1207acab9bcf748c31 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 14 Nov 2011 15:02:44 +0100
Subject: [PATCH] --- yaml --- r: 278127 b: refs/heads/master c:
 a7f23f0a8f6be9d95d8110d34b21ccce03111447 h: refs/heads/master i:   278125:
 2b0bfbc08bc8cdceaa9a49211f9770f1b295f301   278123:
 b69f906a934f9a47d6c10840b1658833f0111c6f   278119:
 09c1a2eca25c86a900e4e1f97f6914cc9c280452   278111:
 55132937859ef90192a1be7e37610f92dd93e78c v: v3

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

diff --git a/[refs] b/[refs]
index 7b33735fd628..b6d266720c39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8505a7e652c8a37bdacfd9d6ad5096c793f55ceb
+refs/heads/master: a7f23f0a8f6be9d95d8110d34b21ccce03111447
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 2b413d38daa7..431988361553 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -571,8 +571,6 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 		switch (tx->key->conf.cipher) {
 		case WLAN_CIPHER_SUITE_WEP40:
 		case WLAN_CIPHER_SUITE_WEP104:
-			if (ieee80211_is_auth(hdr->frame_control))
-				break;
 		case WLAN_CIPHER_SUITE_TKIP:
 			if (!ieee80211_is_data_present(hdr->frame_control))
 				tx->key = NULL;