aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/64/config-5.10
diff options
context:
space:
mode:
authorSergey Ryazanov <ryazanov.s.a@gmail.com>2021-12-17 01:23:08 +0300
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-17 16:16:34 +0100
commitfa3690f8f14fad591fe7896c2dccaa3d06b857e5 (patch)
tree86f1b3729a4f3ab8cd68cb1bf43c56e7d5440893 /target/linux/x86/64/config-5.10
parentb61ab8f57e3f2877d75c7336980f651e638e3dad (diff)
downloadupstream-fa3690f8f14fad591fe7896c2dccaa3d06b857e5.tar.gz
upstream-fa3690f8f14fad591fe7896c2dccaa3d06b857e5.tar.bz2
upstream-fa3690f8f14fad591fe7896c2dccaa3d06b857e5.zip
kernel: 5.10: consolidate mac80211 crypto options
Each of - CRYPTO_AEAD2 - CRYPTO_AEAD - CRYPTO_GF128MUL - CRYPTO_GHASH - CRYPTO_HASH2 - CRYPTO_HASH - CRYPTO_MANAGER2 - CRYPTO_MANAGER - CRYPTO_NULL2 either directly required for mac80211 crypto support, or directly selected by such options. Support for the mac80211 crypto was enabled in the generic config since c7182123b9 ("kernel: make cryptoapi support needed by mac80211 built-in"). So move the above options from the target configs to the generic config to make it clear why do we need them. CC: Felix Fietkau <nbd@nbd.name> Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Diffstat (limited to 'target/linux/x86/64/config-5.10')
-rw-r--r--target/linux/x86/64/config-5.106
1 files changed, 0 insertions, 6 deletions
diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/64/config-5.10
index a62e5a795a..5aac4aa7e2 100644
--- a/target/linux/x86/64/config-5.10
+++ b/target/linux/x86/64/config-5.10
@@ -64,8 +64,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
CONFIG_CPU_RMAP=y
CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AES_NI_INTEL=y
# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set
@@ -78,15 +76,11 @@ CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_CRYPTD=y
# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_GLUE_HELPER_X86=y
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set
-CONFIG_CRYPTO_NULL2=y
# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set
# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set