git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: Reset dynamic ps timer in Rx path.
[safe/jmp/linux-2.6]
/
net
/
mac80211
/
aes_ccm.h
diff --git
a/net/mac80211/aes_ccm.h
b/net/mac80211/aes_ccm.h
index
885f190
..
6e7820e
100644
(file)
--- a/
net/mac80211/aes_ccm.h
+++ b/
net/mac80211/aes_ccm.h
@@
-14,12
+14,12
@@
#define AES_BLOCK_LEN 16
#define AES_BLOCK_LEN 16
-struct crypto_cipher *
ieee80211_aes_key_setup_encrypt(const u8 key[]);
+struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]);
void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
- u8 *
b_0, u8 *aad, u8 *
data, size_t data_len,
+ u8 *data, size_t data_len,
u8 *cdata, u8 *mic);
int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
u8 *cdata, u8 *mic);
int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
- u8 *
b_0, u8 *aad, u8 *
cdata, size_t data_len,
+ u8 *cdata, size_t data_len,
u8 *mic, u8 *data);
void ieee80211_aes_key_free(struct crypto_cipher *tfm);
u8 *mic, u8 *data);
void ieee80211_aes_key_free(struct crypto_cipher *tfm);