X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Ftkip.h;h=b7c2ee763d9d5d03562c3e73ad8710ff46480e00;hb=9df2fe986770bc4c76e8fe72c20b71268eec39a7;hp=73d8ef2a93b0f9ed5821d3a0686b44e65f6e0c63;hpb=dcf397f037f52add9945eced57ca300ab6a4413c;p=linux-2.6

diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h
index 73d8ef2a93..b7c2ee763d 100644
--- 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,7 +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 */