Merge branch 'master' into for-next

[pandora-kernel.git] / net / mac80211 / michael.h

diff --git a/net/mac80211/michael.h b/net/mac80211/michael.h
index 7d5707b..3b848da 100644 (file)
--- a/net/mac80211/michael.h
+++ b/net/mac80211/michael.h
@@ -18,7 +18,7 @@ struct michael_mic_ctx {
        u32 l, r;
 };
 
-void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority,
-                u8 *data, size_t data_len, u8 *mic);
+void michael_mic(const u8 *key, struct ieee80211_hdr *hdr,
+                const u8 *data, size_t data_len, u8 *mic);
 
 #endif /* MICHAEL_H */