Merge remote-tracking branch 'upstream/master'

openwrt/patch/openwrt-6.x/modules/crypto.mk

@@ -81,6 +81,18 @@ endef
 $(eval $(call KernelPackage,crypto-authenc))
 
 
+define KernelPackage/crypto-blake2b
+ TITLE:=Support for BLAKE2b cryptographic hash function (RFC 7693)
+ DEPENDS:=+kmod-crypto-hash
+ KCONFIG:=CONFIG_CRYPTO_BLAKE2B
+ FILES:=$(LINUX_DIR)/crypto/blake2b_generic.ko
+ AUTOLOAD:=$(call AutoLoad,09,blake2b_generic)
+ $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-blake2b))
+
+
 define KernelPackage/crypto-cbc
  TITLE:=Cipher Block Chaining CryptoAPI module
  DEPENDS:=+kmod-crypto-manager
@@ -1158,3 +1170,15 @@ endef
 
 $(eval $(call KernelPackage,crypto-xts))
 
+
+define KernelPackage/crypto-xxhash
+ TITLE:=xxHash non-cryptographic hash algorithm
+ DEPENDS:=+kmod-crypto-hash +kmod-lib-xxhash
+ KCONFIG:=CONFIG_CRYPTO_XXHASH
+ FILES:=$(LINUX_DIR)/crypto/xxhash_generic.ko
+ AUTOLOAD:=$(call AutoLoad,09,xxhash_generic)
+ $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-xxhash))
+

openwrt/patch/openwrt-6.x/modules/fs.mk

@@ -67,7 +67,7 @@ $(eval $(call KernelPackage,fs-autofs4))
 define KernelPackage/fs-btrfs
  SUBMENU:=$(FS_MENU)
  TITLE:=BTRFS filesystem support
- DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd
+ DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b +kmod-crypto-xxhash
  KCONFIG:=\
  CONFIG_BTRFS_FS \
  CONFIG_BTRFS_FS_CHECK_INTEGRITY=n

openwrt/patch/openwrt-6.x/modules/hwmon.mk

@@ -148,7 +148,7 @@ define KernelPackage/hwmon-gsc
  $(LINUX_DIR)/drivers/mfd/gateworks-gsc.ko \
  $(LINUX_DIR)/drivers/hwmon/gsc-hwmon.ko
  AUTOLOAD:=$(call AutoLoad,20,gsc-hwmon,1)
- $(call AddDepends/hwmon,+kmod-i2c-core)
+ $(call AddDepends/hwmon,+kmod-i2c-core +kmod-mfd)
 endef
 
 define KernelPackage/hwmon-gsc/description

openwrt/patch/openwrt-6.x/modules/lib.mk

@@ -122,22 +122,31 @@ endef
 $(eval $(call KernelPackage,lib-lzo))
 
 
+define KernelPackage/lib-xxhash
+ SUBMENU:=$(LIB_MENU)
+ TITLE:=xxhash support
+ HIDDEN:=1
+ KCONFIG:=CONFIG_XXHASH
+ FILES:=$(LINUX_DIR)/lib/xxhash.ko
+endef
+
+$(eval $(call KernelPackage,lib-xxhash))
+
+
 define KernelPackage/lib-zstd
  SUBMENU:=$(LIB_MENU)
  TITLE:=ZSTD support
- DEPENDS:=+kmod-crypto-acompress
+ DEPENDS:=+kmod-crypto-acompress +kmod-lib-xxhash
  KCONFIG:= \
  CONFIG_CRYPTO_ZSTD \
  CONFIG_ZSTD_COMPRESS \
- CONFIG_ZSTD_DECOMPRESS \
- CONFIG_XXHASH
+ CONFIG_ZSTD_DECOMPRESS
  FILES:= \
  $(LINUX_DIR)/crypto/zstd.ko \
- $(LINUX_DIR)/lib/xxhash.ko \
  $(LINUX_DIR)/lib/zstd/zstd_common.ko@ge6.1 \
  $(LINUX_DIR)/lib/zstd/zstd_compress.ko \
  $(LINUX_DIR)/lib/zstd/zstd_decompress.ko
- AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress)
+ AUTOLOAD:=$(call AutoProbe,zstd zstd_compress zstd_decompress)
 endef
 
 define KernelPackage/lib-zstd/description
@@ -147,21 +156,28 @@ endef
 $(eval $(call KernelPackage,lib-zstd))
 
 
+define KernelPackage/lib-lz4-decompress
+ SUBMENU:=$(LIB_MENU)
+ TITLE:=LZ4 decompress
+ HIDDEN:=1
+ KCONFIG:=CONFIG_LZ4_DECOMPRESS
+ FILES:=$(LINUX_DIR)/lib/lz4/lz4_decompress.ko
+endef
+
+$(eval $(call KernelPackage,lib-lz4-decompress))
+
+
 define KernelPackage/lib-lz4
  SUBMENU:=$(LIB_MENU)
  TITLE:=LZ4 support
- DEPENDS:=+kmod-crypto-acompress
+ DEPENDS:=+kmod-crypto-acompress +kmod-lib-lz4-decompress
  KCONFIG:= \
  CONFIG_CRYPTO_LZ4 \
- CONFIG_CRYPTO_LZ4HC \
- CONFIG_LZ4_COMPRESS \
- CONFIG_LZ4_DECOMPRESS
+ CONFIG_LZ4_COMPRESS
  FILES:= \
  $(LINUX_DIR)/crypto/lz4.ko \
- $(LINUX_DIR)/lib/lz4/lz4_compress.ko \
- $(LINUX_DIR)/lib/lz4/lz4hc_compress.ko \
- $(LINUX_DIR)/lib/lz4/lz4_decompress.ko
- AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress lz4hc_compress lz4_decompress)
+ $(LINUX_DIR)/lib/lz4/lz4_compress.ko
+ AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress)
 endef
 
 define KernelPackage/lib-lz4/description
@@ -171,6 +187,26 @@ endef
 $(eval $(call KernelPackage,lib-lz4))
 
 
+define KernelPackage/lib-lz4hc
+ SUBMENU:=$(LIB_MENU)
+ TITLE:=LZ4HC support
+ DEPENDS:=+kmod-crypto-acompress +kmod-lib-lz4-decompress
+ KCONFIG:= \
+ CONFIG_CRYPTO_LZ4HC \
+ CONFIG_LZ4HC_COMPRESS
+ FILES:= \
+ $(LINUX_DIR)/crypto/lz4hc.ko \
+ $(LINUX_DIR)/lib/lz4/lz4hc_compress.ko
+ AUTOLOAD:=$(call AutoProbe,lz4hc lz4hc_compress)
+endef
+
+define KernelPackage/lib-lz4hc/description
+ Kernel module for LZ4HC compression/decompression support
+endef
+
+$(eval $(call KernelPackage,lib-lz4hc))
+
+
 define KernelPackage/lib-842
  SUBMENU:=$(LIB_MENU)
  TITLE:=842 support

openwrt/patch/openwrt-6.x/modules/netfilter.mk

@@ -132,6 +132,22 @@ endef
 $(eval $(call KernelPackage,nf-conntrack6))
 
 
+define KernelPackage/nf-dup-inet
+ SUBMENU:=$(NF_MENU)
+ TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support
+ HIDDEN:=1
+ DEPENDS:=+kmod-nf-conntrack +IPV6:kmod-nf-conntrack6
+ KCONFIG:= \
+ CONFIG_NF_DUP_IPV4 \
+ CONFIG_NF_DUP_IPV6
+ FILES:= \
+ $(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \
+ $(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko
+endef
+
+$(eval $(call KernelPackage,nf-dup-inet))
+
+
 define KernelPackage/nf-log
  SUBMENU:=$(NF_MENU)
  TITLE:=Netfilter Logging
@@ -716,7 +732,7 @@ $(eval $(call KernelPackage,ipt-tproxy))
 
 define KernelPackage/ipt-tee
  TITLE:=TEE support
- DEPENDS:=+kmod-ipt-conntrack
+ DEPENDS:=+kmod-ipt-conntrack +kmod-nf-dup-inet
  KCONFIG:=$(KCONFIG_IPT_TEE)
  FILES:=$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
  AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m)))
@@ -1150,18 +1166,14 @@ $(eval $(call KernelPackage,nft-bridge))
 define KernelPackage/nft-dup-inet
  SUBMENU:=$(NF_MENU)
  TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support
- DEPENDS:=+kmod-nft-core +kmod-nf-conntrack +IPV6:kmod-nf-conntrack6
+ DEPENDS:=+kmod-nft-core +kmod-nf-dup-inet
  KCONFIG:= \
- CONFIG_NF_DUP_IPV4 \
- CONFIG_NF_DUP_IPV6 \
  CONFIG_NFT_DUP_IPV4 \
  CONFIG_NFT_DUP_IPV6
  FILES:= \
- $(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \
- $(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko \
  $(LINUX_DIR)/net/ipv4/netfilter/nft_dup_ipv4.ko \
  $(LINUX_DIR)/net/ipv6/netfilter/nft_dup_ipv6.ko
- AUTOLOAD:=$(call AutoProbe,nf_dup_ipv4 nf_dup_ipv6 nft_dup_ipv4 nft_dup_ipv6)
+ AUTOLOAD:=$(call AutoProbe,nft_dup_ipv4 nft_dup_ipv6)
 endef
 
 $(eval $(call KernelPackage,nft-dup-inet))

openwrt/patch/openwrt-6.x/modules/netsupport.mk

@@ -1246,6 +1246,18 @@ endef
 $(eval $(call KernelPackage,sctp))
 
 
+define KernelPackage/sctp-diag
+ SUBMENU:=$(NETWORK_SUPPORT_MENU)
+ TITLE:=SCTP diag support
+ DEPENDS:=+kmod-sctp +kmod-inet-diag
+ KCONFIG:=CONFIG_INET_SCTP_DIAG
+ FILES:= $(LINUX_DIR)/net/sctp/sctp_diag.ko
+ AUTOLOAD:= $(call AutoLoad,33,sctp_diag)
+endef
+
+$(eval $(call KernelPackage,sctp-diag))
+
+
 define KernelPackage/netem
  SUBMENU:=$(NETWORK_SUPPORT_MENU)
  TITLE:=Network emulation functionality

openwrt/patch/openwrt-6.x/modules/other.mk

@@ -583,6 +583,18 @@ endef
 $(eval $(call KernelPackage,bcma))
 
 
+define KernelPackage/mfd
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=Multifunction device drivers
+ HIDDEN:=1
+ KCONFIG:=CONFIG_MFD_CORE
+ FILES:=$(LINUX_DIR)/drivers/mfd/mfd-core.ko
+ AUTOLOAD:=$(call AutoLoad,10,mfd-core)
+endef
+
+$(eval $(call KernelPackage,mfd))
+
+
 define KernelPackage/rtc-ds1307
  SUBMENU:=$(OTHER_MENU)
  TITLE:=Dallas/Maxim DS1307 (and compatible) RTC support
@@ -835,6 +847,7 @@ define KernelPackage/mtdtests
  TITLE:=MTD subsystem tests
  KCONFIG:=CONFIG_MTD_TESTS
  FILES:=\
+ $(LINUX_DIR)/drivers/mtd/tests/mtd_nandbiterrs.ko \
  $(LINUX_DIR)/drivers/mtd/tests/mtd_nandecctest.ko \
  $(LINUX_DIR)/drivers/mtd/tests/mtd_oobtest.ko \
  $(LINUX_DIR)/drivers/mtd/tests/mtd_pagetest.ko \