From 16099030304f49f53785bd3f705bae60165bfda1 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 29 Nov 2024 17:20:57 +0800 Subject: [PATCH] mt76: add kernel 6.12 support --- package/kernel/mt76/Makefile | 7 ++++++- .../patches-6.x/200-fix-kernel-6.12-support.patch | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 package/kernel/mt76/patches-6.x/200-fix-kernel-6.12-support.patch diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 8bd6b0e80..f194abd23 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mt76 -PKG_RELEASE=1 +PKG_RELEASE=2 PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:= @@ -24,6 +24,11 @@ PKG_SOURCE_DATE:=2024-04-04 PKG_SOURCE_VERSION:=8f301a5c5fe3d998b50666bde1d35d412833be89 PKG_MIRROR_HASH:=49291145ccceeac2964c9a43a46bed88298e5c1da63c6f3c2c1f6b3c1902a61e PATCH_DIR:=./patches-6.x +else ifdef CONFIG_LINUX_6_12 +PKG_SOURCE_DATE:=2024-04-04 +PKG_SOURCE_VERSION:=8f301a5c5fe3d998b50666bde1d35d412833be89 +PKG_MIRROR_HASH:=49291145ccceeac2964c9a43a46bed88298e5c1da63c6f3c2c1f6b3c1902a61e +PATCH_DIR:=./patches-6.x else PKG_SOURCE_DATE:=2023-08-14 PKG_SOURCE_VERSION:=b14c2351ddb8601c322576d84029e463d456caef diff --git a/package/kernel/mt76/patches-6.x/200-fix-kernel-6.12-support.patch b/package/kernel/mt76/patches-6.x/200-fix-kernel-6.12-support.patch new file mode 100644 index 000000000..4bf210caa --- /dev/null +++ b/package/kernel/mt76/patches-6.x/200-fix-kernel-6.12-support.patch @@ -0,0 +1,14 @@ +--- a/mac80211.c ++++ b/mac80211.c +@@ -570,7 +570,11 @@ + { + struct page_pool_params pp_params = { + .order = 0, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,12,0) ++ .flags = 0, ++#else + .flags = PP_FLAG_PAGE_FRAG, ++#endif + .nid = NUMA_NO_NODE, + .dev = dev->dma_dev, + };