aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-01-24 12:52:09 -0500
committerJohannes Berg <johannes.berg@intel.com>2015-01-27 05:10:13 -0500
commit8ade538bf39b1ee53418528fdacd36b8e65621b9 (patch)
treef7bd85219ee6946b493252effe9a39918b309fb4 /net/mac80211/rx.c
parent56c52da2d554f081e8fce58ecbcf6a40c605b95b (diff)
mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers
This allows mac80211 to configure BIP-GMAC-128 and BIP-GMAC-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/rx.c')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 93ebc9525478..ed38d8302659 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1671,6 +1671,10 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
1671 case WLAN_CIPHER_SUITE_BIP_CMAC_256: 1671 case WLAN_CIPHER_SUITE_BIP_CMAC_256:
1672 result = ieee80211_crypto_aes_cmac_256_decrypt(rx); 1672 result = ieee80211_crypto_aes_cmac_256_decrypt(rx);
1673 break; 1673 break;
1674 case WLAN_CIPHER_SUITE_BIP_GMAC_128:
1675 case WLAN_CIPHER_SUITE_BIP_GMAC_256:
1676 result = ieee80211_crypto_aes_gmac_decrypt(rx);
1677 break;
1674 case WLAN_CIPHER_SUITE_GCMP: 1678 case WLAN_CIPHER_SUITE_GCMP:
1675 case WLAN_CIPHER_SUITE_GCMP_256: 1679 case WLAN_CIPHER_SUITE_GCMP_256:
1676 result = ieee80211_crypto_gcmp_decrypt(rx); 1680 result = ieee80211_crypto_gcmp_decrypt(rx);