aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-01-24 12:52:08 -0500
committerJohannes Berg <johannes.berg@intel.com>2015-01-27 05:09:13 -0500
commit56c52da2d554f081e8fce58ecbcf6a40c605b95b (patch)
tree9c28bdf5c73f2f2a3a6d87880a9422e6d16f9d30 /net/mac80211/tx.c
parent2b2ba0db1c820d04d5143452d70012cd44d7b578 (diff)
mac80111: Add BIP-CMAC-256 cipher
This allows mac80211 to configure BIP-CMAC-256 to the driver and also use software-implementation within mac80211 when the driver does not support this with hardware accelaration. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index be57e0afd019..909c27be1fdc 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -639,6 +639,7 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
639 ieee80211_is_mgmt(hdr->frame_control); 639 ieee80211_is_mgmt(hdr->frame_control);
640 break; 640 break;
641 case WLAN_CIPHER_SUITE_AES_CMAC: 641 case WLAN_CIPHER_SUITE_AES_CMAC:
642 case WLAN_CIPHER_SUITE_BIP_CMAC_256:
642 if (!ieee80211_is_mgmt(hdr->frame_control)) 643 if (!ieee80211_is_mgmt(hdr->frame_control))
643 tx->key = NULL; 644 tx->key = NULL;
644 break; 645 break;
@@ -1021,6 +1022,8 @@ ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx)
1021 tx, IEEE80211_CCMP_256_MIC_LEN); 1022 tx, IEEE80211_CCMP_256_MIC_LEN);
1022 case WLAN_CIPHER_SUITE_AES_CMAC: 1023 case WLAN_CIPHER_SUITE_AES_CMAC:
1023 return ieee80211_crypto_aes_cmac_encrypt(tx); 1024 return ieee80211_crypto_aes_cmac_encrypt(tx);
1025 case WLAN_CIPHER_SUITE_BIP_CMAC_256:
1026 return ieee80211_crypto_aes_cmac_256_encrypt(tx);
1024 case WLAN_CIPHER_SUITE_GCMP: 1027 case WLAN_CIPHER_SUITE_GCMP:
1025 case WLAN_CIPHER_SUITE_GCMP_256: 1028 case WLAN_CIPHER_SUITE_GCMP_256:
1026 return ieee80211_crypto_gcmp_encrypt(tx); 1029 return ieee80211_crypto_gcmp_encrypt(tx);