aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-05-06 18:54:49 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-27 22:26:44 -0400
commit76fe1b0e4c093f985c66a062c9c10370b4985796 (patch)
treed7b03713a116d26518ec2ede12799a70f38e3417 /net
parente157249d948bf0c5da10ce8610e2b4b36d0a3c4c (diff)
[PATCH] fix IEEE80211_CRYPT_* selects
Some of the options didn't obey the most important rule of select If you select something, you have to ensure that the dependencies of what you do select are fulfilled. resulting in the following compile error: <-- snip --> ... LD .tmp_vmlinux1 crypto/built-in.o(.init.text+0x31b): In function `aes_init': : undefined reference to `crypto_register_alg' crypto/built-in.o(.init.text+0x326): In function `michael_mic_init': : undefined reference to `crypto_register_alg' crypto/built-in.o(.exit.text+0x6): In function `aes_fini': : undefined reference to `crypto_unregister_alg' crypto/built-in.o(.exit.text+0x16): In function `michael_mic_exit': : undefined reference to `crypto_unregister_alg' net/built-in.o(.text+0x5ba52): In function `ieee80211_ccmp_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5ba94): In function `ieee80211_ccmp_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5bab7): In function `ieee80211_ccmp_deinit': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c5c2): In function `ieee80211_tkip_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5c5d5): In function `ieee80211_tkip_init': : undefined reference to `crypto_alloc_tfm' net/built-in.o(.text+0x5c623): In function `ieee80211_tkip_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c62a): In function `ieee80211_tkip_init': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c65e): In function `ieee80211_tkip_deinit': : undefined reference to `crypto_free_tfm' net/built-in.o(.text+0x5c665): In function `ieee80211_tkip_deinit': : undefined reference to `crypto_free_tfm' make: *** [.tmp_vmlinux1] Error 1 <-- snip --> This patch adds the missing selects of CRYPTO (similar to how IEEE80211_CRYPT_WEP already does it). Yes, you could argue whether CRYPTO should be select'ed by the CRYPTO_* options, but with the current CRYPTO* dependencies this patch is required.
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 23b23f72a9a4..961c711eda97 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -44,6 +44,7 @@ config IEEE80211_CRYPT_WEP
44config IEEE80211_CRYPT_CCMP 44config IEEE80211_CRYPT_CCMP
45 tristate "IEEE 802.11i CCMP support" 45 tristate "IEEE 802.11i CCMP support"
46 depends on IEEE80211 46 depends on IEEE80211
47 select CRYPTO
47 select CRYPTO_AES 48 select CRYPTO_AES
48 ---help--- 49 ---help---
49 Include software based cipher suites in support of IEEE 802.11i 50 Include software based cipher suites in support of IEEE 802.11i
@@ -56,6 +57,7 @@ config IEEE80211_CRYPT_CCMP
56config IEEE80211_CRYPT_TKIP 57config IEEE80211_CRYPT_TKIP
57 tristate "IEEE 802.11i TKIP encryption" 58 tristate "IEEE 802.11i TKIP encryption"
58 depends on IEEE80211 59 depends on IEEE80211
60 select CRYPTO
59 select CRYPTO_MICHAEL_MIC 61 select CRYPTO_MICHAEL_MIC
60 ---help--- 62 ---help---
61 Include software based cipher suites in support of IEEE 802.11i 63 Include software based cipher suites in support of IEEE 802.11i