netdev
[Top] [All Lists]

[2.6.11-rc4-mm1 patch] fix buggy IEEE80211_CRYPT_* selects

To: Andrew Morton <akpm@xxxxxxxx>, netdev@xxxxxxxxxxx, jgarzik@xxxxxxxxx
Subject: [2.6.11-rc4-mm1 patch] fix buggy IEEE80211_CRYPT_* selects
From: Adrian Bunk <bunk@xxxxxxxxx>
Date: Sat, 26 Feb 2005 12:31:23 +0100
Cc: linux-kernel@xxxxxxxxxxxxxxx
In-reply-to: <20050223014233.6710fd73.akpm@xxxxxxxx>
References: <20050223014233.6710fd73.akpm@xxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.5.6+20040907i
On Wed, Feb 23, 2005 at 01:42:33AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.11-rc3-mm1:
>...
>  bk-netdev.patch
>...


Some of the options that needlessly wrote in their help text which 
options they do selct (patch already sent) 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.


--- linux-2.6.11-rc4-mm1-full/net/ieee80211/Kconfig.old 2005-02-26 
12:12:44.000000000 +0100
+++ linux-2.6.11-rc4-mm1-full/net/ieee80211/Kconfig     2005-02-26 
12:13:47.000000000 +0100
@@ -42,10 +42,11 @@
        "ieee80211_crypt_wep".
 
 config IEEE80211_CRYPT_CCMP
        tristate "IEEE 802.11i CCMP support"
        depends on IEEE80211
+       select CRYPTO
        select CRYPTO_AES
        ---help---
        Include software based cipher suites in support of IEEE 802.11i 
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled 
        networks.
@@ -54,10 +55,11 @@
        "ieee80211_crypt_ccmp".
 
 config IEEE80211_CRYPT_TKIP
        tristate "IEEE 802.11i TKIP encryption"
        depends on IEEE80211
+       select CRYPTO
        select CRYPTO_MICHAEL_MIC
        ---help---
        Include software based cipher suites in support of IEEE 802.11i 
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled 
        networks.



<Prev in Thread] Current Thread [Next in Thread>
  • [2.6.11-rc4-mm1 patch] fix buggy IEEE80211_CRYPT_* selects, Adrian Bunk <=