diff options
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index edcd1c7ab83..e05667cd5e7 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1001,8 +1001,6 @@ ieee80211_tx_h_stats(struct ieee80211_tx_data *tx) | |||
1001 | static ieee80211_tx_result debug_noinline | 1001 | static ieee80211_tx_result debug_noinline |
1002 | ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx) | 1002 | ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx) |
1003 | { | 1003 | { |
1004 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb); | ||
1005 | |||
1006 | if (!tx->key) | 1004 | if (!tx->key) |
1007 | return TX_CONTINUE; | 1005 | return TX_CONTINUE; |
1008 | 1006 | ||
@@ -1017,13 +1015,7 @@ ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx) | |||
1017 | case WLAN_CIPHER_SUITE_AES_CMAC: | 1015 | case WLAN_CIPHER_SUITE_AES_CMAC: |
1018 | return ieee80211_crypto_aes_cmac_encrypt(tx); | 1016 | return ieee80211_crypto_aes_cmac_encrypt(tx); |
1019 | default: | 1017 | default: |
1020 | /* handle hw-only algorithm */ | 1018 | return ieee80211_crypto_hw_encrypt(tx); |
1021 | if (info->control.hw_key) { | ||
1022 | ieee80211_tx_set_protected(tx); | ||
1023 | return TX_CONTINUE; | ||
1024 | } | ||
1025 | break; | ||
1026 | |||
1027 | } | 1019 | } |
1028 | 1020 | ||
1029 | return TX_DROP; | 1021 | return TX_DROP; |