diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-07-06 22:02:14 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:11:24 -0400 |
commit | 0cd20a278e1ef9da9f6a987942794c9d65af8c4d (patch) | |
tree | efd5aa9a72518f32518dcb4b85b78626cbc8113e /net/mac80211/key.h | |
parent | 544e5d8bcd7ab305494e57cfa388b2d06a43c520 (diff) | |
download | linux-0cd20a278e1ef9da9f6a987942794c9d65af8c4d.tar.gz linux-0cd20a278e1ef9da9f6a987942794c9d65af8c4d.tar.bz2 linux-0cd20a278e1ef9da9f6a987942794c9d65af8c4d.zip |
mac80211: use AES_BLOCK_SIZE
mac80211 has a defnition of AES_BLOCK_SIZE and
multiple definitions of AES_BLOCK_LEN. Remove
them all and use crypto/aes.h.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/key.h')
-rw-r--r-- | net/mac80211/key.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/key.h b/net/mac80211/key.h index fcb52eb2f92f..05abab05b0aa 100644 --- a/net/mac80211/key.h +++ b/net/mac80211/key.h @@ -92,9 +92,6 @@ struct ieee80211_key { u8 rx_pn[NUM_RX_DATA_QUEUES + 1][6]; struct crypto_cipher *tfm; u32 replays; /* dot11RSNAStatsCCMPReplays */ -#ifndef AES_BLOCK_LEN -#define AES_BLOCK_LEN 16 -#endif } ccmp; struct { atomic64_t tx_pn; |