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;