aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds2006-10-25 20:20:41 -0700
committerLinus Torvalds2006-10-25 20:20:41 -0700
commit8c8a0eab988c94294adbbb4fe955bba7d8ebddcf (patch)
tree7af509b78594aeff7d6e076c806c84cc200686ed /net
parent8483ca3c99559027a3741af7f56f6b36887f7fd5 (diff)
parentbcbaecbb9968750d4bfb2686a97e396f681f88ef (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] users: Select ECB/CBC where needed
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index f7e84e9d13ad..a64be6cdf078 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -32,6 +32,7 @@ config IEEE80211_CRYPT_WEP
depends on IEEE80211
select CRYPTO
select CRYPTO_ARC4
+ select CRYPTO_ECB
select CRC32
---help---
Include software based cipher suites in support of IEEE
@@ -58,6 +59,7 @@ config IEEE80211_CRYPT_TKIP
depends on IEEE80211 && NET_RADIO
select CRYPTO
select CRYPTO_MICHAEL_MIC
+ select CRYPTO_ECB
select CRC32
---help---
Include software based cipher suites in support of IEEE 802.11i