diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-01-24 18:52:07 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-27 11:07:35 +0100 |
| commit | 2b2ba0db1c820d04d5143452d70012cd44d7b578 (patch) | |
| tree | 7c186fc249d191d9ecba66e740e7a4c922a986d5 /net/mac80211/wpa.h | |
| parent | mac80111: Add GCMP and GCMP-256 ciphers (diff) | |
| download | linux-2b2ba0db1c820d04d5143452d70012cd44d7b578.tar.xz linux-2b2ba0db1c820d04d5143452d70012cd44d7b578.zip | |
mac80111: Add CCMP-256 cipher
This allows mac80211 to configure CCMP-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>
[squash ccmp256 -> mic_len argument change]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/wpa.h')
| -rw-r--r-- | net/mac80211/wpa.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/wpa.h b/net/mac80211/wpa.h index ea955f278351..43e109f27a89 100644 --- a/net/mac80211/wpa.h +++ b/net/mac80211/wpa.h @@ -24,9 +24,11 @@ ieee80211_rx_result ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx); ieee80211_tx_result -ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx); +ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx, + unsigned int mic_len); ieee80211_rx_result -ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx); +ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx, + unsigned int mic_len); ieee80211_tx_result ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx); |