diff options
author | Janusz Dziedzic <janusz.dziedzic@tieto.com> | 2011-06-01 14:40:13 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:00:38 +0100 |
commit | 7f7ae327ebaad3f22e7cef63e31f1d25e68176f9 (patch) | |
tree | be278c1e706d1a99fb3a40445448e5023873d492 /net/mac80211/rx.c | |
parent | 0ffb416d682df31c959b4769659d8c47bc0e8c91 (diff) |
wireless-next: WAPI support for hardware-accelerated drivers
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24551
Tested-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com>
Reviewed-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com>
Change-Id: I0300854865f8de07413164fd4461a9c8aae5dff3
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26976
Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33473
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.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 fe2c2a71779..a86e0df2fe8 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -27,6 +27,7 @@ #include "wpa.h" #include "tkip.h" #include "wme.h" +#include "wapi.h" /* * monitor mode reception @@ -1053,6 +1054,9 @@ 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_SMS4: + result = ieee80211_crypto_wapi_decrypt(rx); + break; default: /* * We can reach here only with HW-only algorithms |