Merge pull request #65 from coolsnowwolf/master

20241221 日常更新 bonding
xayane · Dec 21, 2024 · 10bc963 · 10bc963
2 parents 4562340 + b49e92a
commit 10bc963
Show file tree

Hide file tree

Showing 57 changed files with 12,675 additions and 14 deletions.
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .173
-LINUX_KERNEL_HASH-5.15.173 = 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8
+LINUX_VERSION-5.15 = .174
+LINUX_KERNEL_HASH-5.15.174 = c3e63cb864a05b6bbc886613c9e91714106b7a9ab40c31c101da0ca5b64d760a
diff --git 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
@@ -0,0 +1,28 @@
+--- a/vfs.c
++++ b/vfs.c
+@@ -1604,12 +1604,25 @@
+ #endif
+ 		err = vfs_rename(&rd);
+ #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 230)
++		struct renamedata rd = {
++			.old_dir	= d_inode(src_dent_parent),
++			.old_dentry	= src_dent,
++			.new_dir	= d_inode(dst_dent_parent),
++			.new_dentry	= dst_dent,
++			.delegated_inode	= NULL,
++			.flags		= 0,
++		};
++		
++		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
@@ -147,7 +147,7 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
 
  	genlmsg_end(msg, hdr);
 
-+#if (LINUX_VERSION_IS_GEQ(6,1,115) && LINUX_VERSION_IS_LESS(6,1,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 <sashal@kernel.org>
 
  	genlmsg_end(msg, hdr);
 
-+#if (LINUX_VERSION_IS_GEQ(6,1,115) && LINUX_VERSION_IS_LESS(6,1,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

diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile
@@ -18,7 +18,7 @@ define Package/default-settings
   CATEGORY:=LuCI
   TITLE:=LuCI support for Default Settings
   PKGARCH:=all
-  DEPENDS:=+luci-base +luci +@LUCI_LANG_zh-cn +@LUCI_LANG_zh_Hans
+  DEPENDS:=+luci-base +luci +@LUCI_LANG_zh-cn +@LUCI_LANG_zh_Hans +@LUCI_LANG_en
 endef
 
 define Package/default-settings/description

diff --git a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
@@ -10,18 +10,18 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1080,12 +1080,18 @@ static const struct usb_device_id produc
+@@ -1081,6 +1081,10 @@
  		USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
  		.driver_info = (unsigned long)&qmi_wwan_info,
  	},
 +	{	/* Meiglink SGM828 */
 +		USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49, USB_CLASS_VENDOR_SPEC, 0x10, 0x05),
 +		.driver_info = (unsigned long)&qmi_wwan_info,
 +	},
-+
+ 	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0122)},	/* Quectel RG650V */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)},	/* Quectel EC25, EC20 R2.0  Mini PCIe */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)},	/* Quectel EP06/EG06/EM06 */
- 	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)},	/* Quectel EG12/EM12 */
+@@ -1088,6 +1092,7 @@
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},	/* Quectel EM160R-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},	/* Quectel RM500Q-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},	/* Quectel RM520N */

diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -197,6 +197,11 @@ ramips_setup_macs()
 		lan_mac=$(macaddr_add "$label_mac" 1)
 		wan_mac=$label_mac
 		;;
+	huasifei,mt7621dtu)
+		label_mac=$(mtd_get_mac_binary factory 0x4)
+		lan_mac=$label_mac
+		wan_mac=$(macaddr_add "$label_mac" 1)
+		;;
 	hiwifi,hc5962)
 		lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")
 		label_mac=$lan_mac

diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile
@@ -8,7 +8,7 @@ FEATURES:=ext4 audio usb usbgadget display gpio fpu pci pcie rootfs-part boot-pa
 SUBTARGETS:=armv8 rk35xx
 
 KERNEL_PATCHVER:=6.6
-KERNEL_TESTING_PATCHVER:=6.1
+KERNEL_TESTING_PATCHVER:=6.12
 
 define Target/Description
 	Build firmware image for Rockchip SoC devices.