From e96002e3923c5ce054171dc241ae0418d52fcc35 Mon Sep 17 00:00:00 2001 From: Nick Hainke <vincent@systemli.org> Date: Tue, 26 Jul 2022 16:46:44 +0200 Subject: [PATCH 01/14] mtools: update to 4.0.40 Changes: - Remove libbsd dependency - Better compatibility with legacy platforms such as AT&T UnixPC - Upgraded to autoconf 2.71 Signed-off-by: Nick Hainke <vincent@systemli.org> --- tools/mtools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mtools/Makefile b/tools/mtools/Makefile index c10e887b3609ba..74007a88d05d56 100644 --- a/tools/mtools/Makefile +++ b/tools/mtools/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtools -PKG_VERSION:=4.0.37 +PKG_VERSION:=4.0.40 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=799b197e23e47b61259628810b27790efb7a1fe36037ef1da8a27b0ae4fa8342 +PKG_HASH:=a22fca42354011dd2293a7f51f228b46ebbd802e7740b0975912afecb79d5df4 HOST_BUILD_PARALLEL:=1 From fab893c9d64bbc8d40b55b1da0ae0a42cc6b261f Mon Sep 17 00:00:00 2001 From: Nick Hainke <vincent@systemli.org> Date: Tue, 26 Jul 2022 16:16:27 +0200 Subject: [PATCH 02/14] libcap: update to 2.64 Changes: 38cfa2e Up the release version to 2.64 7617af6 Avoid a deadlock in forked psx thread exit. fc029cb Include LIBCAP_{MAJOR,MINOR} #define's in sys/capability.h ceaa591 Clarify how the cap_get_pid() argument is interpreted. 15cacf2 Fix prctl return code/errno handling in libcap. aae9374 Be explicit about CGO_ENABLED=1 for compare-cap build. 66a8a14 psx: free allocated memory at exit. Signed-off-by: Nick Hainke <vincent@systemli.org> --- package/libs/libcap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libcap/Makefile b/package/libs/libcap/Makefile index dcd535becd7598..7a1e36bb7088ad 100644 --- a/package/libs/libcap/Makefile +++ b/package/libs/libcap/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcap -PKG_VERSION:=2.63 +PKG_VERSION:=2.64 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2 -PKG_HASH:=0c637b8f44fc7d8627787e9cf57f15ac06c1ddccb53e41feec5496be3466f77f +PKG_HASH:=c8465e1f0b068d5fc06199231135ccac7adb56d662b1de93589252e8cd071e13 PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at> PKG_LICENSE:=GPL-2.0-only From 690ee8c18142ef48a1f4755fc37c52d8281d35c8 Mon Sep 17 00:00:00 2001 From: Nick Hainke <vincent@systemli.org> Date: Tue, 26 Jul 2022 16:18:51 +0200 Subject: [PATCH 03/14] libcap: update to 2.65 Changes: a47d86d Up the release version to 2.65 fc99e56 Include more signatures in pgp.keys.asc. 52288cc Close out this comment in the go/Makefile eb0f1df Prevent 'capsh --user=xxx --' from generating a bash error. 9a95791 Improve documentation for cap_get_pid and cap_reset_ambient. 21d08b0 Fix syntax error in DEBUG protected setcap.c code. 9425048 More useful captree usage string and man page. Signed-off-by: Nick Hainke <vincent@systemli.org> --- package/libs/libcap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libcap/Makefile b/package/libs/libcap/Makefile index 7a1e36bb7088ad..0e4ffc6e02839c 100644 --- a/package/libs/libcap/Makefile +++ b/package/libs/libcap/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcap -PKG_VERSION:=2.64 +PKG_VERSION:=2.65 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2 -PKG_HASH:=c8465e1f0b068d5fc06199231135ccac7adb56d662b1de93589252e8cd071e13 +PKG_HASH:=73e350020cc31fe15360879d19384ffa3395a825f065fcf6bda3a5cdf965bebd PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at> PKG_LICENSE:=GPL-2.0-only From 94f7c18695bfe5be13a40e366b924e7b9d4df82d Mon Sep 17 00:00:00 2001 From: lean <coolsnowwolf@gmail.com> Date: Thu, 4 Aug 2022 19:19:25 +0800 Subject: [PATCH 04/14] linux: fix 5.19 patch build error --- ...k-events-support-multiple-registrant.patch | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch index 71d304ef0cd63e..acf8deb7d2ab4c 100644 --- a/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch @@ -53,32 +53,31 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org> e = nf_ct_ecache_find(ct); if (e == NULL) -@@ -128,10 +135,12 @@ nf_conntrack_event_report(enum ip_conntr +@@ -117,20 +124,24 @@ u32 portid, int report) { #ifdef CONFIG_NF_CONNTRACK_EVENTS +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS - const struct net *net = nf_ct_net(ct); - - if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) - return 0; + if (nf_ct_ecache_exist(ct)) + return nf_conntrack_eventmask_report(1 << event, ct, portid, report); + #endif + return 0; +#endif + } - return nf_conntrack_eventmask_report(1 << event, ct, portid, report); - #else -@@ -143,10 +152,12 @@ static inline int + static inline int nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct) { #ifdef CONFIG_NF_CONNTRACK_EVENTS +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS - const struct net *net = nf_ct_net(ct); - - if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) - return 0; + if (nf_ct_ecache_exist(ct)) + return nf_conntrack_eventmask_report(1 << event, ct, 0, 0); + #endif + return 0; +#endif + } - return nf_conntrack_eventmask_report(1 << event, ct, 0, 0); - #else + #ifdef CONFIG_NF_CONNTRACK_EVENTS --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -112,6 +112,9 @@ struct netns_ct { From 15df97d309c573cabe9e05168043b3bc5ea548e7 Mon Sep 17 00:00:00 2001 From: lean <coolsnowwolf@gmail.com> Date: Thu, 4 Aug 2022 19:32:08 +0800 Subject: [PATCH 05/14] Update README.md --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3e3d51269ab09f..83888a96cc67d4 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,11 @@ 如何编译自己需要的 OpenWrt 固件 [English](./README_EN.md) +## 官方讨论群 +如有技术问题需要讨论或者交流,欢迎加入以下群: +1. QQ 讨论群: Op固件技术研究群 ,号码 891659613 ,加群链接: 点击链接加入群聊【 Op固件技术研究群 】:[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群") +2. TG 讨论群: OP 编译官方大群 ,加群链接: 点击链接加入群聊【 OP 编译官方大群 】:[点击加入](https://t.me/joinchat/JhKgAA6Hx1uiihA7RaTW1w "OP 编译官方大群") + ## 注意 1. **不要用 root 用户进行编译** @@ -113,14 +118,12 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin 1. 源代码中绝不含任何后门和可以监控或者劫持你的 HTTPS 的闭源软件, SSL 安全是互联网最后的壁垒。安全干净才是固件应该做到的; -2. 如有技术问题需要讨论,欢迎加入 QQ 讨论群: OP 共享技术交流群 ,号码 297253733 ,加群链接: 点击链接加入群聊【 OP 共享技术交流群】:[点击加入](https://jq.qq.com/?_wv=1027&k=5yCRuXL "OP共享技术交流群") - -3. 想学习 OpenWrt 开发,但是摸不着门道?自学没毅力?基础太差?怕太难学不会?跟着佐大学 OpenWrt 开发入门培训班助你能学有所成 +2. 想学习 OpenWrt 开发,但是摸不着门道?自学没毅力?基础太差?怕太难学不会?跟着佐大学 OpenWrt 开发入门培训班助你能学有所成 报名地址:[点击报名](http://forgotfun.org/2018/04/openwrt-training-2018.html "报名") -4. QCA IPQ60xx 开源仓库地址:<https://github.com/coolsnowwolf/openwrt-gl-ax1800> +3. QCA IPQ60xx 开源仓库地址:<https://github.com/coolsnowwolf/openwrt-gl-ax1800> -5. 稳定版仓库地址:<https://github.com/coolsnowwolf/openwrt> +4. 存档版本仓库地址:<https://github.com/coolsnowwolf/openwrt> ## 软路由介绍 From 1258152bd776d7d1cf3a4e4ea007d9377c1c80e7 Mon Sep 17 00:00:00 2001 From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com> Date: Thu, 4 Aug 2022 19:33:49 +0800 Subject: [PATCH 06/14] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 83888a96cc67d4..e57ff9e9fd5e64 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ ## 官方讨论群 如有技术问题需要讨论或者交流,欢迎加入以下群: -1. QQ 讨论群: Op固件技术研究群 ,号码 891659613 ,加群链接: 点击链接加入群聊【 Op固件技术研究群 】:[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群") -2. TG 讨论群: OP 编译官方大群 ,加群链接: 点击链接加入群聊【 OP 编译官方大群 】:[点击加入](https://t.me/joinchat/JhKgAA6Hx1uiihA7RaTW1w "OP 编译官方大群") +1. QQ 讨论群: Op固件技术研究群 ,号码 891659613 ,加群链接:[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群") +2. TG 讨论群: OP 编译官方大群 ,加群链接:[点击加入](https://t.me/joinchat/JhKgAA6Hx1uiihA7RaTW1w "OP 编译官方大群") ## 注意 From db9659b5db23868dec1ed840f53b04c2aee32710 Mon Sep 17 00:00:00 2001 From: lean <coolsnowwolf@gmail.com> Date: Thu, 4 Aug 2022 19:36:06 +0800 Subject: [PATCH 07/14] Version update to R22.8.2 --- package/lean/default-settings/Makefile | 2 +- package/lean/default-settings/files/zzz-default-settings | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 381d303dc6b66d..086ccf99442e68 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=2 -PKG_RELEASE:=28 +PKG_RELEASE:=29 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index dc9034514943c6..4e8138c848254a 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -46,7 +46,7 @@ sed -i '/option disabled/d' /etc/config/wireless sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='R22.7.7'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R22.8.2'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release From 962a1027cc96b7371bfe8115e58cdeac0bbd7342 Mon Sep 17 00:00:00 2001 From: lean <coolsnowwolf@gmail.com> Date: Thu, 4 Aug 2022 21:11:02 +0800 Subject: [PATCH 08/14] x86: switch test kernel to 5.19 --- .../hack-5.19/904-debloat_dma_buf.patch | 93 +++++++++++++++++++ target/linux/x86/Makefile | 2 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 target/linux/generic/hack-5.19/904-debloat_dma_buf.patch diff --git a/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch new file mode 100644 index 00000000000000..e2803e15a209c2 --- /dev/null +++ b/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch @@ -0,0 +1,93 @@ +From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001 +From: Felix Fietkau <nbd@nbd.name> +Date: Sat, 8 Jul 2017 08:20:43 +0200 +Subject: debloat: dmabuf + +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + drivers/base/Kconfig | 2 +- + drivers/dma-buf/Makefile | 10 +++++++--- + drivers/dma-buf/dma-buf.c | 4 +++- + kernel/sched/core.c | 1 + + 4 files changed, 12 insertions(+), 5 deletions(-) + +--- a/drivers/base/Kconfig ++++ b/drivers/base/Kconfig +@@ -198,7 +198,7 @@ config SOC_BUS + source "drivers/base/regmap/Kconfig" + + config DMA_SHARED_BUFFER +- bool ++ tristate + default n + select IRQ_WORK + help +--- a/drivers/dma-buf/heaps/Makefile ++++ b/drivers/dma-buf/heaps/Makefile +@@ -1,3 +1,3 @@ + # SPDX-License-Identifier: GPL-2.0 +-obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o +-obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o ++dma-buf-objs-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o ++dma-buf-objs-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o +--- a/drivers/dma-buf/Makefile ++++ b/drivers/dma-buf/Makefile +@@ -1,12 +1,14 @@ + # SPDX-License-Identifier: GPL-2.0-only +-obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ ++obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o ++ ++dma-buf-objs-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ + dma-resv.o +-obj-$(CONFIG_DMABUF_HEAPS) += dma-heap.o +-obj-$(CONFIG_DMABUF_HEAPS) += heaps/ +-obj-$(CONFIG_SYNC_FILE) += sync_file.o +-obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o +-obj-$(CONFIG_UDMABUF) += udmabuf.o +-obj-$(CONFIG_DMABUF_SYSFS_STATS) += dma-buf-sysfs-stats.o ++dma-buf-objs-$(CONFIG_DMABUF_HEAPS) += dma-heap.o ++obj-$(CONFIG_DMABUF_HEAPS) += heaps/ ++dma-buf-objs-$(CONFIG_SYNC_FILE) += sync_file.o ++dma-buf-objs-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o ++dma-buf-objs-$(CONFIG_UDMABUF) += udmabuf.o ++dma-buf-objs-$(CONFIG_DMABUF_SYSFS_STATS) += udmabuf.o + + dmabuf_selftests-y := \ + selftest.o \ +@@ -15,4 +17,6 @@ dmabuf_selftests-y := \ + st-dma-fence-unwrap.o \ + st-dma-resv.o + +-obj-$(CONFIG_DMABUF_SELFTESTS) += dmabuf_selftests.o ++dma-buf-objs-$(CONFIG_DMABUF_SELFTESTS) += dmabuf_selftests.o ++ ++dma-shared-buffer-objs := $(dma-buf-objs-y) +--- a/drivers/dma-buf/dma-buf.c ++++ b/drivers/dma-buf/dma-buf.c +@@ -1459,4 +1459,5 @@ static void __exit dma_buf_deinit(void) + kern_unmount(dma_buf_mnt); + dma_buf_uninit_sysfs_statistics(); + } +-__exitcall(dma_buf_deinit); ++module_exit(dma_buf_deinit); ++MODULE_LICENSE("GPL"); +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -4287,6 +4287,7 @@ int wake_up_state(struct task_struct *p, + { + return try_to_wake_up(p, state, 0); + } ++EXPORT_SYMBOL_GPL(wake_up_state); + + /* + * Perform scheduler related setup for a newly forked process p. +--- a/fs/d_path.c ++++ b/fs/d_path.c +@@ -314,6 +314,7 @@ char *dynamic_dname(struct dentry *dentr + buffer += buflen - sz; + return memcpy(buffer, temp, sz); + } ++EXPORT_SYMBOL_GPL(dynamic_dname); + + char *simple_dname(struct dentry *dentry, char *buffer, int buflen) + { diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 02cc36a8700139..1ed83ca13cdc5b 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -11,7 +11,7 @@ FEATURES:=squashfs vdi vmdk vhdx pcmcia fpu boot-part rootfs-part SUBTARGETS:=64 generic legacy geode KERNEL_PATCHVER:=5.15 -KERNEL_TESTING_PATCHVER:=5.18 +KERNEL_TESTING_PATCHVER:=5.19 KERNELNAME:=bzImage From cfc113b29f4d8b247e8e645efa3b6b31aa3060e1 Mon Sep 17 00:00:00 2001 From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com> Date: Thu, 4 Aug 2022 21:23:28 +0800 Subject: [PATCH 09/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e57ff9e9fd5e64..22c5af58aa73cb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ## 官方讨论群 如有技术问题需要讨论或者交流,欢迎加入以下群: 1. QQ 讨论群: Op固件技术研究群 ,号码 891659613 ,加群链接:[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群") -2. TG 讨论群: OP 编译官方大群 ,加群链接:[点击加入](https://t.me/joinchat/JhKgAA6Hx1uiihA7RaTW1w "OP 编译官方大群") +2. TG 讨论群: OP 编译官方大群 ,加群链接:[点击加入](https://t.me/JhKgAA6Hx1 "OP 编译官方大群") ## 注意 From 785fe8dbb869e45a6feadfde7002fcf6eecb391a Mon Sep 17 00:00:00 2001 From: lean <coolsnowwolf@gmail.com> Date: Fri, 5 Aug 2022 00:36:00 +0800 Subject: [PATCH 10/14] x86: fix 5.19 modules.mk --- target/linux/x86/modules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/x86/modules.mk b/target/linux/x86/modules.mk index de572cb33cd338..8d21bf473bdb0d 100644 --- a/target/linux/x86/modules.mk +++ b/target/linux/x86/modules.mk @@ -22,7 +22,7 @@ $(eval $(call KernelPackage,amazon-ena)) define KernelPackage/amd-xgbe SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=AMD Ethernet on SoC support - DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_18):kmod-mdio-devres + DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres KCONFIG:=CONFIG_AMD_XGBE FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/xgbe/amd-xgbe.ko AUTOLOAD:=$(call AutoLoad,35,amd-xgbe) From 84f9ec62e280134df06152320d80704f67fae664 Mon Sep 17 00:00:00 2001 From: coolsnowwolf <coolsowwolf@gmail.com> Date: Thu, 4 Aug 2022 17:30:38 +0000 Subject: [PATCH 11/14] r8125: add kernel 5.19 support --- .../lean/r8125/patches/020-5.19-support.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/lean/r8125/patches/020-5.19-support.patch diff --git a/package/lean/r8125/patches/020-5.19-support.patch b/package/lean/r8125/patches/020-5.19-support.patch new file mode 100644 index 00000000000000..778e21888a902d --- /dev/null +++ b/package/lean/r8125/patches/020-5.19-support.patch @@ -0,0 +1,18 @@ +--- a/src/r8125_n.c ++++ b/src/r8125_n.c +@@ -116,6 +116,15 @@ + #define FIRMWARE_8168FP_3 "rtl_nic/rtl8168fp-3.fw" + #define FIRMWARE_8168FP_4 "rtl_nic/rtl8168fp-4.fw" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++static inline void netif_set_gso_max_size(struct net_device *dev, ++ unsigned int size) ++{ ++ /* dev->gso_max_size is read locklessly from sk_setup_caps() */ ++ WRITE_ONCE(dev->gso_max_size, size); ++} ++#endif ++ + /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). + The RTL chips use a 64 element hash table based on the Ethernet CRC. */ + static const int multicast_filter_limit = 32; From 07adaa5bebdbb9c6a2e4ba5dde1dd4996f6b5f26 Mon Sep 17 00:00:00 2001 From: coolsnowwolf <coolsowwolf@gmail.com> Date: Thu, 4 Aug 2022 17:49:52 +0000 Subject: [PATCH 12/14] r8152: add kernel 5.19 support --- .../lean/r8152/patches/010-5.19-support.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 package/lean/r8152/patches/010-5.19-support.patch diff --git a/package/lean/r8152/patches/010-5.19-support.patch b/package/lean/r8152/patches/010-5.19-support.patch new file mode 100644 index 00000000000000..3046862320daf7 --- /dev/null +++ b/package/lean/r8152/patches/010-5.19-support.patch @@ -0,0 +1,19 @@ +--- a/r8152.c ++++ b/r8152.c +@@ -1026,6 +1026,16 @@ + #define RTL_ADVERTISED_1000_FULL BIT(5) + #define RTL_ADVERTISED_2500_FULL BIT(6) + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++static inline void netif_set_gso_max_size(struct net_device *dev, ++ unsigned int size) ++{ ++ /* dev->gso_max_size is read locklessly from sk_setup_caps() */ ++ WRITE_ONCE(dev->gso_max_size, size); ++} ++#endif ++ ++ + /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). + * The RTL chips use a 64 element hash table based on the Ethernet CRC. + */ From ba6dc2427f59768ff09af36f2539b1f215e7c56f Mon Sep 17 00:00:00 2001 From: coolsnowwolf <coolsowwolf@gmail.com> Date: Thu, 4 Aug 2022 17:53:43 +0000 Subject: [PATCH 13/14] r8168: add kernel 5.19 support --- .../lean/r8168/patches/030-5.19-support.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/lean/r8168/patches/030-5.19-support.patch diff --git a/package/lean/r8168/patches/030-5.19-support.patch b/package/lean/r8168/patches/030-5.19-support.patch new file mode 100644 index 00000000000000..07c94921fe6dfa --- /dev/null +++ b/package/lean/r8168/patches/030-5.19-support.patch @@ -0,0 +1,18 @@ +--- a/src/r8168_n.c ++++ b/src/r8168_n.c +@@ -116,6 +116,15 @@ + #define FIRMWARE_8168FP_3 "rtl_nic/rtl8168fp-3.fw" + #define FIRMWARE_8168FP_4 "rtl_nic/rtl8168fp-4.fw" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++static inline void netif_set_gso_max_size(struct net_device *dev, ++ unsigned int size) ++{ ++ /* dev->gso_max_size is read locklessly from sk_setup_caps() */ ++ WRITE_ONCE(dev->gso_max_size, size); ++} ++#endif ++ + /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). + The RTL chips use a 64 element hash table based on the Ethernet CRC. */ + static const int multicast_filter_limit = 32; From 729dcd5bcae2d4d22cf1ccbdb159ae556b98659f Mon Sep 17 00:00:00 2001 From: coolsnowwolf <coolsowwolf@gmail.com> Date: Thu, 4 Aug 2022 19:13:26 +0000 Subject: [PATCH 14/14] linux-atm: add kernel 5.19 support --- .../patches/900-add_5.19_support.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package/network/utils/linux-atm/patches/900-add_5.19_support.patch diff --git a/package/network/utils/linux-atm/patches/900-add_5.19_support.patch b/package/network/utils/linux-atm/patches/900-add_5.19_support.patch new file mode 100644 index 00000000000000..0dc26dc4d29d50 --- /dev/null +++ b/package/network/utils/linux-atm/patches/900-add_5.19_support.patch @@ -0,0 +1,17 @@ +--- a/src/maint/Makefile.am ++++ b/src/maint/Makefile.am +@@ -1,5 +1,5 @@ + BOOTPGMS=atmaddr esi +-SYSPGMS=atmloop atmtcp enitune zntune hediag # nstune ++SYSPGMS=atmloop atmtcp enitune hediag # nstune + USRPGMS=atmdiag atmdump sonetdiag saaldump + + INCLUDES=-I$(srcdir)/../q2931 -I$(srcdir)/../saal -I. +@@ -14,7 +14,6 @@ esi_SOURCES = esi.c + atmloop_SOURCES = atmloop.c + atmtcp_SOURCES = atmtcp.c + enitune_SOURCES = enitune.c +-zntune_SOURCES = zntune.c + #nstune_SOURCES = nstune.c + + atmdiag_SOURCES = atmdiag.c