aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-12-14 16:40:24 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-12-14 16:40:24 +0000
commit5991eb39b920114c48e7550279727b8134ea6e2a (patch)
tree3b47c5e8629057811fde52df2902c5fd3ad635bc /package/kernel
parent96d5726e924517bc513843c7a021a8e4bbaabfd9 (diff)
downloadupstream-5991eb39b920114c48e7550279727b8134ea6e2a.tar.gz
upstream-5991eb39b920114c48e7550279727b8134ea6e2a.tar.bz2
upstream-5991eb39b920114c48e7550279727b8134ea6e2a.zip
kernel: move BLKCIPHER into crypto-core to avoid pulling in crypto-manager for arc4 (used by mac80211)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39052
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/linux/modules/crypto.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index da5474aeae..dbeffa7df5 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -7,12 +7,13 @@
CRYPTO_MENU:=Cryptographic API modules
-CRYPTO_MODULES = ALGAPI2=crypto_algapi
+CRYPTO_MODULES = \
+ ALGAPI2=crypto_algapi \
+ BLKCIPHER2=crypto_blkcipher
CRYPTOMGR_MODULES = \
AEAD2=aead \
MANAGER2=cryptomgr \
- BLKCIPHER2=crypto_blkcipher
crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko
@@ -24,6 +25,7 @@ define KernelPackage/crypto-core
KCONFIG:= \
CONFIG_CRYPTO=y \
CONFIG_CRYPTO_HW=y \
+ CONFIG_CRYPTO_BLKCIPHER \
CONFIG_CRYPTO_ALGAPI \
$(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
@@ -53,7 +55,6 @@ define KernelPackage/crypto-manager
DEPENDS:=+kmod-crypto-hash +kmod-crypto-pcompress
KCONFIG:= \
CONFIG_CRYPTO_AEAD \
- CONFIG_CRYPTO_BLKCIPHER \
CONFIG_CRYPTO_MANAGER \
$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_confvar,$(mod)))
FILES:=$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_file,$(mod)))
@@ -248,7 +249,7 @@ define KernelPackage/crypto-arc4
KCONFIG:=CONFIG_CRYPTO_ARC4
FILES:=$(LINUX_DIR)/crypto/arc4.ko
AUTOLOAD:=$(call AutoLoad,09,arc4)
- $(call AddDepends/crypto,+!LINUX_3_3:kmod-crypto-manager)
+ $(call AddDepends/crypto)
endef
$(eval $(call KernelPackage,crypto-arc4))