diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-09 02:39:41 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-09 02:39:41 +0400 |
commit | 54dceb008ffcbe003bea9017cad1227a83b6fc3f (patch) | |
tree | d4e3345ead16da19efe38dbf97ade38309f8b4f7 /net/mac80211/michael.h | |
parent | 11a100f844f6096787ab20e19f17d72abc957a8f (diff) | |
parent | b46372710ab536c0967f76be5dc41341583d4a54 (diff) | |
download | linux-54dceb008ffcbe003bea9017cad1227a83b6fc3f.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/michael.h')
-rw-r--r-- | net/mac80211/michael.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/michael.h b/net/mac80211/michael.h index 69b4501f13ba..3b848dad9587 100644 --- a/net/mac80211/michael.h +++ b/net/mac80211/michael.h @@ -18,7 +18,7 @@ struct michael_mic_ctx { u32 l, r; }; -void michael_mic(const u8 *key, const u8 *da, const u8 *sa, u8 priority, +void michael_mic(const u8 *key, struct ieee80211_hdr *hdr, const u8 *data, size_t data_len, u8 *mic); #endif /* MICHAEL_H */ |