diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-01-24 19:52:06 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-27 11:06:09 +0100 |
| commit | 00b9cfa3ff38401bd70c34b250ca13e5ea347b4a (patch) | |
| tree | 1c3564bf28a6f4b49140a5e023520a1dc658d5c6 /net/mac80211/rx.c | |
| parent | cfcf1682c4ca8f601a4702255958e0b1c9aa12cc (diff) | |
mac80111: Add GCMP and GCMP-256 ciphers
This allows mac80211 to configure GCMP and GCMP-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>
[remove a spurious newline]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index ed516ae80a3b..a11d2518c365 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1655,6 +1655,10 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) case WLAN_CIPHER_SUITE_AES_CMAC: result = ieee80211_crypto_aes_cmac_decrypt(rx); break; + case WLAN_CIPHER_SUITE_GCMP: + case WLAN_CIPHER_SUITE_GCMP_256: + result = ieee80211_crypto_gcmp_decrypt(rx); + break; default: result = ieee80211_crypto_hw_decrypt(rx); } |