diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-14 17:15:39 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-14 17:15:39 -0700 |
commit | 942e7b102a4827fdb69a39c7f07c544542589ef9 (patch) | |
tree | 4c47174c91eb76aaa31abc141adbee1acc649987 /net/mac80211/tkip.h | |
parent | 7d06b2e053d2d536348e3a0f6bb02982a41bea37 (diff) | |
parent | 87291c0269e77b029282676448fed3706a54211a (diff) | |
download | talos-op-linux-942e7b102a4827fdb69a39c7f07c544542589ef9.tar.gz talos-op-linux-942e7b102a4827fdb69a39c7f07c544542589ef9.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/tkip.h')
-rw-r--r-- | net/mac80211/tkip.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h index b890427fc959..d4714383f5fc 100644 --- a/net/mac80211/tkip.h +++ b/net/mac80211/tkip.h @@ -13,8 +13,8 @@ #include <linux/crypto.h> #include "key.h" -u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, - u8 iv0, u8 iv1, u8 iv2); +u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16); + void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm, struct ieee80211_key *key, u8 *pos, size_t payload_len, u8 *ta); |