diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-12 16:16:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-12 16:16:02 -0700 |
| commit | a7e70158884629898d79709622a66b8ef99e4018 (patch) | |
| tree | bd0cd03816f85f5bcef84000e01b0f9701f063ed /net/mac80211/tkip.c | |
| parent | 24743537d3f784a8b3014e934fad0a9c45e4e789 (diff) | |
| parent | 252f4bf400df1712408fe83ba199a66a1b57ab1d (diff) | |
| download | linux-a7e70158884629898d79709622a66b8ef99e4018.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/tkip.c')
| -rw-r--r-- | net/mac80211/tkip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c index e840c9cd46db..757e4eb2baf7 100644 --- a/net/mac80211/tkip.c +++ b/net/mac80211/tkip.c @@ -202,7 +202,7 @@ EXPORT_SYMBOL(ieee80211_get_tkip_key); * @payload_len is the length of payload (_not_ including IV/ICV length). * @ta is the transmitter addresses. */ -int ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm, +int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm, struct ieee80211_key *key, u8 *pos, size_t payload_len, u8 *ta) { @@ -223,7 +223,7 @@ int ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm, * beginning of the buffer containing IEEE 802.11 header payload, i.e., * including IV, Ext. IV, real data, Michael MIC, ICV. @payload_len is the * length of payload, including IV, Ext. IV, MIC, ICV. */ -int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm, +int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm, struct ieee80211_key *key, u8 *payload, size_t payload_len, u8 *ta, u8 *ra, int only_iv, int queue, |