diff --git a/include/kernel-5.10 b/include/kernel-5.10 index c298f9131..9d7681d15 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .187 -LINUX_KERNEL_HASH-5.10.187 = f69454210b3e9e00e8b8368aaa897d4ca59f8be3b85399a2fcaecbf17af98bbb +LINUX_VERSION-5.10 = .190 +LINUX_KERNEL_HASH-5.10.190 = 29723df01d40ff07ff6d254eaaf90c7b3ec3c70f4ebe089b80f785f46efaf597 diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 4cb62e661..a7bbd738f 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -93,8 +93,8 @@ define KernelPackage/vxlan +IPV6:kmod-udptunnel6 KCONFIG:=CONFIG_VXLAN FILES:= \ - $(LINUX_DIR)/drivers/net/vxlan.ko@lt5.18 \ - $(LINUX_DIR)/drivers/net/vxlan/vxlan.ko@ge5.18 + $(LINUX_DIR)/drivers/net/vxlan.ko@lt5.5 \ + $(LINUX_DIR)/drivers/net/vxlan/vxlan.ko@ge5.6 AUTOLOAD:=$(call AutoLoad,13,vxlan) endef diff --git a/package/lean/r8152/patches/001-rework-eth-hw-addr-set-for-kernel-5.4.patch b/package/lean/r8152/patches/001-rework-eth-hw-addr-set-for-kernel-5.4.patch index 49bc62984..baa780fd7 100644 --- a/package/lean/r8152/patches/001-rework-eth-hw-addr-set-for-kernel-5.4.patch +++ b/package/lean/r8152/patches/001-rework-eth-hw-addr-set-for-kernel-5.4.patch @@ -1,7 +1,7 @@ From f409f1cbfbeedc7b35b6651de9873e597f2f78e1 Mon Sep 17 00:00:00 2001 From: W_Y_CPP <383152993@qq.com> Date: Thu, 10 Aug 2023 23:15:47 +0900 -Subject: [PATCH] rework eth hw addr set for kernel 5.4 +Subject: [PATCH] rework eth hw addr set for kernel 5.x --- src/compatibility.h | 2 ++ @@ -15,12 +15,12 @@ index 7738d17..25ffc39 100644 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,8,0) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0) */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,4,251) || LINUX_VERSION_CODE > KERNEL_VERSION(5,10,0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,4,251) || LINUX_VERSION_CODE < KERNEL_VERSION(5,10,190)) static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) { memcpy(dev->dev_addr, addr, 6); } -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,4,251) || LINUX_VERSION_CODE > KERNEL_VERSION(5,10,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,4,251) || LINUX_VERSION_CODE < KERNEL_VERSION(5,10,190) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0) */ #ifndef FALSE