X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f2e92218b49fcee06ca568e3a3b229f14362f23a..8cbeef3fb8238deb798172f63d5994cbc7bc9a85:/package/kernel/modules/crypto.mk

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 68c1a95cf..e2361a26c 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -28,17 +28,25 @@ endif
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
   SHA512_SUFFIX:=$(CRYPTO_GENERIC)
 endif
+AEAD_CONF:=AEAD
+MANAGER_CONF:=MANAGER
+BLKCIPHER_CONF:=BLKCIPHER
+HASH_CONF:=HASH
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
-  CRYPTO_MODULE_PCOMPRESS:=PCOMPRESS=pcompress
+  CRYPTO_MODULE_PCOMPRESS:=PCOMP=pcompress
+  AEAD_CONF:=AEAD2
+  MANAGER_CONF:=MANAGER2
+  BLKCIPHER_CONF:=BLKCIPHER2
+  HASH_CONF:=HASH2
 endif
 
 CRYPTO_MODULES = \
 	ALGAPI=crypto_algapi \
-	AEAD=aead \
+	$(AEAD_CONF)=aead \
 	$(CRYPTO_MODULE_PCOMPRESS) \
-	BLKCIPHER=$(BLKCIPHER_PREFIX)blkcipher \
-	HASH=crypto_hash \
-	MANAGER=cryptomgr \
+	$(BLKCIPHER_CONF)=$(BLKCIPHER_PREFIX)blkcipher \
+	$(HASH_CONF)=crypto_hash \
+	$(MANAGER_CONF)=cryptomgr \
 	CBC=cbc \
 	ECB=ecb \
 	DEFLATE=deflate
@@ -117,7 +125,9 @@ define KernelPackage/crypto-hw-ixp4xx
   TITLE:=Intel IXP4xx hardware crypto module
   DEPENDS:= \
 	@TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-authenc
-  KCONFIG:= CONFIG_CRYPTO_DEV_IXP4XX
+  KCONFIG:= \
+	CONFIG_CRYPTO_HW=y \
+	CONFIG_CRYPTO_DEV_IXP4XX
   FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
 endef