---

yaml --- r: 278127 b: refs/heads/master c: a7f23f0 h: refs/heads/master i: 278125: 2b0bfbc 278123: b69f906 278119: 09c1a2e 278111: 5513293 v: v3
git-mirror · Nov 17, 2011 · 4e482da · 4e482da
1 parent 9d5cf96
commit 4e482da
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;