diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
| commit | 788c0a53164c05c5ccdb1472474372b72ba74644 (patch) | |
| tree | 5f274102e3dc4bcca6cb3a695aa2c8228ad5fc4f /net/mac80211/michael.h | |
| parent | e64bda89b8fe81cce9b4a20885d2c204c2d52532 (diff) | |
| parent | 78cf07472f0ede8394bacc4bc02354505080cfe1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/ps3_gelic_wireless.c
drivers/net/wireless/libertas/main.c
Diffstat (limited to 'net/mac80211/michael.h')
| -rw-r--r-- | net/mac80211/michael.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/michael.h b/net/mac80211/michael.h index 2e6aebabeea1..69b4501f13ba 100644 --- a/net/mac80211/michael.h +++ b/net/mac80211/michael.h | |||
| @@ -14,7 +14,11 @@ | |||
| 14 | 14 | ||
| 15 | #define MICHAEL_MIC_LEN 8 | 15 | #define MICHAEL_MIC_LEN 8 |
| 16 | 16 | ||
| 17 | void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority, | 17 | struct michael_mic_ctx { |
| 18 | u8 *data, size_t data_len, u8 *mic); | 18 | u32 l, r; |
| 19 | }; | ||
| 20 | |||
| 21 | void michael_mic(const u8 *key, const u8 *da, const u8 *sa, u8 priority, | ||
| 22 | const u8 *data, size_t data_len, u8 *mic); | ||
| 19 | 23 | ||
| 20 | #endif /* MICHAEL_H */ | 24 | #endif /* MICHAEL_H */ |