diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-25 20:20:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-25 20:20:03 -0400 |
| commit | f89e6e3834035c6e8203042f3527931aa7f52496 (patch) | |
| tree | a82677254fe4511679d5690606ac75f4300fefe1 /net/mac80211/tkip.h | |
| parent | 7cbca67c073263c179f605bdbbdc565ab29d801d (diff) | |
| parent | 3a643d244f09fa1fdd25d48a56a073c1a69583ee (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'net/mac80211/tkip.h')
| -rw-r--r-- | net/mac80211/tkip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h index 73d8ef2a93b0..ffaee3253e19 100644 --- a/net/mac80211/tkip.h +++ b/net/mac80211/tkip.h | |||
| @@ -31,7 +31,7 @@ enum { | |||
| 31 | int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm, | 31 | int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm, |
| 32 | struct ieee80211_key *key, | 32 | struct ieee80211_key *key, |
| 33 | u8 *payload, size_t payload_len, u8 *ta, | 33 | u8 *payload, size_t payload_len, u8 *ta, |
| 34 | int only_iv, int queue, | 34 | u8 *ra, int only_iv, int queue, |
| 35 | u32 *out_iv32, u16 *out_iv16); | 35 | u32 *out_iv32, u16 *out_iv16); |
| 36 | 36 | ||
| 37 | #endif /* TKIP_H */ | 37 | #endif /* TKIP_H */ |