diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-08 15:39:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-08 15:39:41 -0700 |
| commit | 54dceb008ffcbe003bea9017cad1227a83b6fc3f (patch) | |
| tree | d4e3345ead16da19efe38dbf97ade38309f8b4f7 /net/mac80211/aes_ccm.h | |
| parent | 11a100f844f6096787ab20e19f17d72abc957a8f (diff) | |
| parent | b46372710ab536c0967f76be5dc41341583d4a54 (diff) | |
| download | op-kernel-dev-54dceb008ffcbe003bea9017cad1227a83b6fc3f.zip op-kernel-dev-54dceb008ffcbe003bea9017cad1227a83b6fc3f.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/aes_ccm.h')
| -rw-r--r-- | net/mac80211/aes_ccm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/aes_ccm.h b/net/mac80211/aes_ccm.h index 8cd0f14..6e7820e 100644 --- a/net/mac80211/aes_ccm.h +++ b/net/mac80211/aes_ccm.h @@ -16,10 +16,10 @@ struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]); 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 *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); |
