298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-15 18:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.287

Browse Source
This commit is contained in:
coolsnowwolf 2024-12-18 21:56:26 +08:00
parent c1846ee3f8
commit 33e376de95
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.4
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .284 LINUX_VERSION-5.4 = .287
LINUX_KERNEL_HASH-5.4.284 = 77221ab9aebeac746915c755ec3b7d320f85cd219c63d9c501820fbca1e3b32b LINUX_KERNEL_HASH-5.4.287 = 0d0ffae5bf0e6f9c6a1ce42da2bc2a8696ca55721c103497eb1245be8cc04b20

17
package/kernel/ksmbd/patches/03-fix-build-with-kernel-5.10.patch
View File

@ -1,15 +1,10 @@
--- a/vfs.c --- a/vfs.c
+++ b/vfs.c +++ b/vfs.c
@@ -1604,12 +1604,16 @@ @@ -1604,12 +1604,25 @@
#endif #endif
err = vfs_rename(&rd); err = vfs_rename(&rd);
#else #else
- err = vfs_rename(d_inode(src_dent_parent), +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 230)
- src_dent,
- d_inode(dst_dent_parent),
- dst_dent,
- NULL,
- 0);
+ struct renamedata rd = { + struct renamedata rd = {
+ .old_dir = d_inode(src_dent_parent), + .old_dir = d_inode(src_dent_parent),
+ .old_dentry = src_dent, + .old_dentry = src_dent,
@ -20,6 +15,14 @@
+ }; + };
+ +
+ err = vfs_rename(&rd); + 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 #endif
} }
if (err) if (err)

4
package/kernel/mac80211/patches/build/236-fix-genlmsg_multicast_allns-build-error.patch
View File

@ -147,7 +147,7 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
genlmsg_end(msg, hdr); 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, + genlmsg_multicast_allns(&nl80211_fam, msg, 0,
+ NL80211_MCGRP_REGULATORY); + NL80211_MCGRP_REGULATORY);
+#else +#else
@ -163,7 +163,7 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
genlmsg_end(msg, hdr); 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, + genlmsg_multicast_allns(&nl80211_fam, msg, 0,
+ NL80211_MCGRP_REGULATORY); + NL80211_MCGRP_REGULATORY);
+#else +#else