kernel: modules: adapt for kernel 6.1

Adapt kernel modules to support kernel 6.1.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index c4b68611927991d9ae6777547fd4ba74c91d0bc5..3eb4fe7672252936ce95695b8057d048f73151ac 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -109,9 +109,9 @@ define KernelPackage/fs-cifs
     +kmod-crypto-ccm \
     +kmod-crypto-ecb \
     +kmod-crypto-des \
-    +(LINUX_5_15):kmod-asn1-decoder \
-    +(LINUX_5_15):kmod-oid-registry \
-    +(LINUX_5_15):kmod-dnsresolver
+    +(LINUX_5_15||LINUX_6_1):kmod-asn1-decoder \
+    +(LINUX_5_15||LINUX_6_1):kmod-oid-registry \
+    +(LINUX_5_15||LINUX_6_1):kmod-dnsresolver
 endef
 
 define KernelPackage/fs-cifs/description

diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index e0810c97bdcff28f43ea801acae4011b47acf20d..1a09e4e8655915b530fdb3973b5029633104a3cc 100644 (file)
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -52,7 +52,7 @@ define KernelPackage/hwmon-adt7410
        $(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
        $(LINUX_DIR)/drivers/hwmon/adt7410.ko
   AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410)
-  $(call AddDepends/hwmon,+kmod-i2c-core)
+  $(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_1:kmod-regmap-core)
 endef
 
 define KernelPackage/hwmon-adt7410/description

diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk
index 15fd1ccddc423c07e1c71ced8b61cb2c05b6c940..c3ae62b76620dad8f875d1deb6da138b65f8c868 100644 (file)
--- a/package/kernel/linux/modules/i2c.mk
+++ b/package/kernel/linux/modules/i2c.mk
@@ -84,6 +84,20 @@ endef
 $(eval $(call KernelPackage,i2c-algo-pcf))
 
 
+I2C_CCGS_UCSI_MODULES:= \
+  CONFIG_I2C_CCGX_UCSI:drivers/i2c/busses/i2c-ccgx-ucsi
+
+define KernelPackage/i2c-ccgs-ucsi
+  $(call i2c_defaults,$(I2C_CCGS_UCSI_MODULES),58)
+  TITLE:=Cypress CCGx Type-C controller
+  DEPENDS:=+kmod-i2c-core +kmod-regmap-core
+  HIDDEN:=y
+endef
+
+
+$(eval $(call KernelPackage,i2c-ccgs-ucsi))
+
+
 I2C_DWCORE_MODULES:= \
   CONFIG_I2C_DESIGNWARE_CORE:drivers/i2c/busses/i2c-designware-core
 
@@ -103,7 +117,7 @@ I2C_DWPCI_MODULES:= \
 define KernelPackage/i2c-designware-pci
   $(call i2c_defaults,$(I2C_DWPCI_MODULES),59)
   TITLE:=Synopsys DesignWare PCI
-  DEPENDS:=+kmod-i2c-designware-core
+  DEPENDS:=+kmod-i2c-designware-core +kmod-i2c-ccgs-ucsi
 endef
 
 define KernelPackage/i2c-designware-pci/description

diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index 81ceb1f76ce036e9fe47d212f7f20fb5858d2367..9c29ed72e80b7976fa3cde95b2773a7b0baae417 100644 (file)
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -134,6 +134,7 @@ define KernelPackage/lib-zstd
   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)

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index e6e2c9b6371e0d2bad0be58ea76170d5474a68a4..f31c0ad1e85e0c67ece02bce545df93436e960f8 100644 (file)
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -1148,21 +1148,44 @@ endef
 $(eval $(call KernelPackage,nft-nat))
 
 
+define KernelPackage/nft-offload-ipv4
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter nf_tables routing/NAT offload support (ipv4)
+  DEPENDS:=@!LINUX_6_1 +kmod-nf-flow +kmod-nft-nat
+  KCONFIG:= CONFIG_NF_FLOW_TABLE_IPV4@lt5.17
+  FILES:= $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko@lt5.17
+  HIDDEN:=y
+  AUTOLOAD:=$(call AutoProbe,nf_flow_table_ipv4)
+endef
+
+$(eval $(call KernelPackage,nft-offload-ipv4))
+
+
+define KernelPackage/nft-offload-ipv6
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter nf_tables routing/NAT offload support (ipv6)
+  DEPENDS:=@!LINUX_6_1 @IPV6 +kmod-nf-flow +kmod-nft-nat
+  KCONFIG:= CONFIG_NF_FLOW_TABLE_IPV6@lt5.17
+  FILES:= $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko@lt5.17
+  HIDDEN:=y
+  AUTOLOAD:=$(call AutoProbe,nf_flow_table_ipv6)
+endef
+
+$(eval $(call KernelPackage,nft-offload-ipv6))
+
+
 define KernelPackage/nft-offload
   SUBMENU:=$(NF_MENU)
   TITLE:=Netfilter nf_tables routing/NAT offload support
-  DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat
+  DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat \
+       +kmod-nft-offload-ipv4 +kmod-nft-offload-ipv6
   KCONFIG:= \
        CONFIG_NF_FLOW_TABLE_INET \
-       CONFIG_NF_FLOW_TABLE_IPV4 \
-       CONFIG_NF_FLOW_TABLE_IPV6 \
        CONFIG_NFT_FLOW_OFFLOAD
   FILES:= \
        $(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \
-       $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko \
-       $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko \
        $(LINUX_DIR)/net/netfilter/nft_flow_offload.ko
-  AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nf_flow_table_ipv4 nf_flow_table_ipv6 nft_flow_offload)
+  AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nft_flow_offload)
 endef
 
 $(eval $(call KernelPackage,nft-offload))

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 9afee41aedf9d3a62de3f6b345d05853b492b998..e7ad4e6690fdf12d15e2b2c5889ea1d11f87df02 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -91,7 +91,9 @@ define KernelPackage/vxlan
        +kmod-udptunnel4 \
        +IPV6:kmod-udptunnel6
   KCONFIG:=CONFIG_VXLAN
-  FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
+  FILES:= \
+       $(LINUX_DIR)/drivers/net/vxlan.ko@lt5.18 \
+       $(LINUX_DIR)/drivers/net/vxlan/vxlan.ko@ge5.18
   AUTOLOAD:=$(call AutoLoad,13,vxlan)
 endef
 
@@ -1204,7 +1206,7 @@ define KernelPackage/sctp
   FILES:= $(LINUX_DIR)/net/sctp/sctp.ko
   AUTOLOAD:= $(call AutoLoad,32,sctp)
   DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac \
-    +LINUX_5_15:kmod-udptunnel4 +LINUX_5_15:kmod-udptunnel6
+    +(LINUX_5_15||LINUX_6_1):kmod-udptunnel4 +(LINUX_5_15||LINUX_6_1):kmod-udptunnel6
 endef
 
 define KernelPackage/sctp/description

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index f15a08d62ea81617eb72d10ad521602f761473ab..c443ef1d026e0f0d5263cb7d2b8b3b996a7229da 100644 (file)
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -56,7 +56,8 @@ define KernelPackage/bluetooth
        $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \
        $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
        $(LINUX_DIR)/drivers/bluetooth/btusb.ko \
-       $(LINUX_DIR)/drivers/bluetooth/btintel.ko
+       $(LINUX_DIR)/drivers/bluetooth/btintel.ko \
+       $(LINUX_DIR)/drivers/bluetooth/btmtk.ko@ge5.17
   AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
 endef
 

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 4ee70d7eb9a9e9ad2cd76a20f04555317186c06a..0605c402d487e2d9a2513d697d0575223efa75e5 100644 (file)
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1155,7 +1155,10 @@ $(eval $(call KernelPackage,usb-net-aqc111))
 
 define KernelPackage/usb-net-asix
   TITLE:=Kernel module for USB-to-Ethernet Asix convertors
-  DEPENDS:=+kmod-libphy +LINUX_5_15:kmod-net-selftests +LINUX_5_15:kmod-mdio-devres +kmod-phy-ax88796b
+  DEPENDS:= \
+       +kmod-libphy +(LINUX_5_15||LINUX_6_1):kmod-net-selftests \
+       +LINUX_6_1:kmod-phylink +(LINUX_5_15||LINUX_6_1):kmod-mdio-devres \
+       +kmod-phy-ax88796b
   KCONFIG:=CONFIG_USB_NET_AX8817X
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
   AUTOLOAD:=$(call AutoProbe,asix)