powerpc/mpc52xx_psc_spi: use linux/of_platform.h instead of asm

[linux-2.6-omap-h63xx.git] / net / mac80211 / tkip.h

diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h
index a0d181a180495f786156790bbec9dc4470ce7430..b7c2ee763d9d5d03562c3e73ad8710ff46480e00 100644 (file)
--- a/net/mac80211/tkip.h
+++ b/net/mac80211/tkip.h
@@ -11,7 +11,7 @@
 
 #include <linux/types.h>
 #include <linux/crypto.h>
-#include "ieee80211_key.h"
+#include "key.h"
 
 u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
                           u8 iv0, u8 iv1, u8 iv2);
@@ -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);
+                               u8 *ra, int only_iv, int queue,
+                               u32 *out_iv32, u16 *out_iv16);
 
 #endif /* TKIP_H */