From 33e376de95ea5c0aa22ba7bc78dca75c1262e0d1 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 18 Dec 2024 21:56:26 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.287 --- include/kernel-5.4 | 4 ++-- .../patches/03-fix-build-with-kernel-5.10.patch | 17 ++++++++++------- ...ix-genlmsg_multicast_allns-build-error.patch | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index 838d6376d..e199e7b4d 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .284 -LINUX_KERNEL_HASH-5.4.284 = 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b +LINUX_VERSION-5.4 = .287 +LINUX_KERNEL_HASH-5.4.287 = 0d0ffae5bf0e6f9c6a1ce42da2bc2a8696ca55721c103497eb1245be8cc04b20 diff --git a/package/kernel/ksmbd/patches/03-fix-build-with-kernel-5.10.patch b/package/kernel/ksmbd/patches/03-fix-build-with-kernel-5.10.patch index 781734d94..0007a91e8 100644 --- a/package/kernel/ksmbd/patches/03-fix-build-with-kernel-5.10.patch +++ b/package/kernel/ksmbd/patches/03-fix-build-with-kernel-5.10.patch @@ -1,15 +1,10 @@ --- a/vfs.c +++ b/vfs.c -@@ -1604,12 +1604,16 @@ +@@ -1604,12 +1604,25 @@ #endif err = vfs_rename(&rd); #else -- err = vfs_rename(d_inode(src_dent_parent), -- src_dent, -- d_inode(dst_dent_parent), -- dst_dent, -- NULL, -- 0); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 230) + struct renamedata rd = { + .old_dir = d_inode(src_dent_parent), + .old_dentry = src_dent, @@ -20,6 +15,14 @@ + }; + + err = vfs_rename(&rd); ++#else + err = vfs_rename(d_inode(src_dent_parent), + src_dent, + d_inode(dst_dent_parent), + dst_dent, + NULL, + 0); ++#endif #endif } if (err) diff --git a/package/kernel/mac80211/patches/build/236-fix-genlmsg_multicast_allns-build-error.patch b/package/kernel/mac80211/patches/build/236-fix-genlmsg_multicast_allns-build-error.patch index f360550b8..891099c30 100644 --- a/package/kernel/mac80211/patches/build/236-fix-genlmsg_multicast_allns-build-error.patch +++ b/package/kernel/mac80211/patches/build/236-fix-genlmsg_multicast_allns-build-error.patch @@ -147,7 +147,7 @@ Signed-off-by: Sasha Levin genlmsg_end(msg, hdr); -+#if (LINUX_VERSION_IS_GEQ(6,1,115) && LINUX_VERSION_IS_LESS(6,1,999)) || ((LINUX_VERSION_IS_GEQ(5,10,230) && LINUX_VERSION_IS_LESS(5,10,999))) || ((LINUX_VERSION_IS_GEQ(5,15,170) && LINUX_VERSION_IS_LESS(5,15,999))) || LINUX_VERSION_IS_GEQ(6,6,59) ++#if LINUX_VERSION_IS_GEQ(6,6,59) || LINUX_VERSION_IS_GEQ(6,1,115) || LINUX_VERSION_IS_GEQ(5,10,230) || LINUX_VERSION_IS_GEQ(5,4,283) + genlmsg_multicast_allns(&nl80211_fam, msg, 0, + NL80211_MCGRP_REGULATORY); +#else @@ -163,7 +163,7 @@ Signed-off-by: Sasha Levin genlmsg_end(msg, hdr); -+#if (LINUX_VERSION_IS_GEQ(6,1,115) && LINUX_VERSION_IS_LESS(6,1,999)) || ((LINUX_VERSION_IS_GEQ(5,10,230) && LINUX_VERSION_IS_LESS(5,10,999))) || ((LINUX_VERSION_IS_GEQ(5,15,170) && LINUX_VERSION_IS_LESS(5,15,999))) || LINUX_VERSION_IS_GEQ(6,6,59) ++#if LINUX_VERSION_IS_GEQ(6,6,59) || LINUX_VERSION_IS_GEQ(6,1,115) || LINUX_VERSION_IS_GEQ(5,10,230) || LINUX_VERSION_IS_GEQ(5,4,283) + genlmsg_multicast_allns(&nl80211_fam, msg, 0, + NL80211_MCGRP_REGULATORY); +#else