diff options
| author | Jouni Malinen | 2015-01-24 18:52:08 +0100 |
|---|---|---|
| committer | Johannes Berg | 2015-01-27 11:09:13 +0100 |
| commit | 56c52da2d554f081e8fce58ecbcf6a40c605b95b (patch) | |
| tree | 9c28bdf5c73f2f2a3a6d87880a9422e6d16f9d30 /net/mac80211/tx.c | |
| parent | mac80111: Add CCMP-256 cipher (diff) | |
| download | kernel-qcow2-linux-56c52da2d554f081e8fce58ecbcf6a40c605b95b.tar.gz kernel-qcow2-linux-56c52da2d554f081e8fce58ecbcf6a40c605b95b.tar.xz kernel-qcow2-linux-56c52da2d554f081e8fce58ecbcf6a40c605b95b.zip | |
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.c | 3 |
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) ieee80211_is_mgmt(hdr->frame_control); break; case WLAN_CIPHER_SUITE_AES_CMAC: + case WLAN_CIPHER_SUITE_BIP_CMAC_256: if (!ieee80211_is_mgmt(hdr->frame_control)) tx->key = NULL; break; @@ -1021,6 +1022,8 @@ ieee80211_tx_h_encrypt(struct ieee80211_tx_data *tx) tx, IEEE80211_CCMP_256_MIC_LEN); case WLAN_CIPHER_SUITE_AES_CMAC: return ieee80211_crypto_aes_cmac_encrypt(tx); + case WLAN_CIPHER_SUITE_BIP_CMAC_256: + return ieee80211_crypto_aes_cmac_256_encrypt(tx); case WLAN_CIPHER_SUITE_GCMP: case WLAN_CIPHER_SUITE_GCMP_256: return ieee80211_crypto_gcmp_encrypt(tx); |