]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
kernel: crypto: fix build with Linux >= 6.18 after octeon-md5 removal
authorAndrew LaMarche <andrewjlamarche@gmail.com>
Wed, 22 Apr 2026 12:24:10 +0000 (12:24 +0000)
committerNick Hainke <vincent@systemli.org>
Sun, 26 Apr 2026 08:03:37 +0000 (10:03 +0200)
Linux commit c9e5ac0 ("lib/crypto: mips/md5: Migrate optimized code into
library") removed the MIPS-Octeon-specific MD5 implementation
(octeon-md5.ko) and replaced it with an optimized library implementation
in lib/crypto.

As a result, CONFIG_CRYPTO_MD5_OCTEON and the module
arch/mips/crypto/octeon-md5.ko no longer exist in kernels >= 6.18.

Signed-off-by: Andrew LaMarche <andrewjlamarche@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23031
Signed-off-by: Nick Hainke <vincent@systemli.org>
package/kernel/linux/modules/crypto.mk

index 650fdd598f9a442c96df8cc973a82e85cfb2f186..aa8a52ec5f2d4ec5348457e7c0faf3640ecdc4ea 100644 (file)
@@ -740,7 +740,7 @@ define KernelPackage/crypto-md5
   DEPENDS:=+kmod-crypto-hash
   KCONFIG:= \
        CONFIG_CRYPTO_MD5 \
-       CONFIG_CRYPTO_MD5_OCTEON \
+       CONFIG_CRYPTO_MD5_OCTEON@lt6.18 \
        CONFIG_CRYPTO_MD5_PPC@lt6.18
   FILES:=$(LINUX_DIR)/crypto/md5.ko \
        $(LINUX_DIR)/lib/crypto/libmd5.ko@ge6.18
@@ -749,8 +749,8 @@ define KernelPackage/crypto-md5
 endef
 
 define KernelPackage/crypto-md5/octeon
-  FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-md5.ko
-  AUTOLOAD+=$(call AutoLoad,09,octeon-md5)
+  FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-md5.ko@lt6.18
+  AUTOLOAD+=$(call AutoLoad,09,LINUX_6_12:octeon-md5)
 endef
 
 define KernelPackage/crypto-md5/powerpc