git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
net
/
mac80211
/
tkip.h
diff --git
a/net/mac80211/tkip.h
b/net/mac80211/tkip.h
index
a0d181a
..
73d8ef2
100644
(file)
--- a/
net/mac80211/tkip.h
+++ b/
net/mac80211/tkip.h
@@
-31,6
+31,7
@@
enum {
int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
struct ieee80211_key *key,
u8 *payload, size_t payload_len, u8 *ta,
- int only_iv, int queue);
+ int only_iv, int queue,
+ u32 *out_iv32, u16 *out_iv16);
#endif /* TKIP_H */