kernel: Enable Geode AES module again.

This has successfully been tested with an ALIX board.

Fixes #10123.

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 93ed5678ce5e1fc036b92f9a4b146c36da5a99e0..d6625169c1712f060142f6cecfdfcf14f6432ba4 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -245,7 +245,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_powersave.ko
 #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_stats.ko
 #lib/modules/KVER-ipfire/kernel/drivers/crypto
-#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko.off
+#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko
 #lib/modules/KVER-ipfire/kernel/drivers/crypto/hifn_795x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/crypto/padlock-aes.ko
 #lib/modules/KVER-ipfire/kernel/drivers/crypto/padlock-sha.ko

diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index b1973b9482e4a4c33bbd41d3381cce71ea33478a..a7eaf4000a68854b2b360f97c6ccf5ecd1d3ee43 100644 (file)
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -243,7 +243,7 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_powersave.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_stats.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto
-#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko.off
+#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-aes.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-sha.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/dca

diff --git a/lfs/linux b/lfs/linux
index 52853c739f7185dfb46cb1d75469cff8b56cf062..274657ce5b66d0df10eb75c6e0e92d562285110d 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -278,10 +278,6 @@ ifeq "$(LASTKERNEL)" "1"
        # Disable ipv6 at runtime
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
 endif
-
-       # Disable geode_aes modul if exist
-       -mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
-           /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off
 endif
 
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*