summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tkip.h
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-06-11 23:22:00 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-06-14 18:18:13 +0200
commitc801242c38de247d82f12f6bf28bd19a280a12ae (patch)
tree7ad4a20083f24b433e36ab28bda09ea87f499bdc /net/mac80211/tkip.h
parentmac80211: rx.c use new helpers (diff)
downloadlinux-c801242c38de247d82f12f6bf28bd19a280a12ae.tar.xz
linux-c801242c38de247d82f12f6bf28bd19a280a12ae.zip
mac80211: tkip.c consolidate tkip IV writing in helper
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tkip.h')
-rw-r--r--net/mac80211/tkip.h4
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);