From d787839afaaa4f49feb657cd3f930d8e436e76fe Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sat, 25 May 2024 08:13:21 +0200 Subject: [PATCH] ltq-vdsl-vr11-mei: remove support for older kernel versions There's only v6.6 in-tree, remove anything older. Signed-off-by: Andre Heider Link: https://github.com/openwrt/openwrt/pull/18056 Signed-off-by: Hauke Mehrtens --- .../lantiq/ltq-vdsl-vr11-mei/patches/100-compat.patch | 4 +--- .../ltq-vdsl-vr11-mei/patches/130-support-kernel-6.6.patch | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/100-compat.patch index 74e88894d8..58df61a0cb 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/100-compat.patch +++ b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/100-compat.patch @@ -10,13 +10,11 @@ --- a/src/drv_mei_cpe_linux.h +++ b/src/drv_mei_cpe_linux.h -@@ -110,6 +110,10 @@ typedef irqreturn_t (*usedIsrHandler_t)( +@@ -110,6 +110,8 @@ typedef irqreturn_t (*usedIsrHandler_t)( # endif #endif -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)) +#define PDE_DATA pde_data -+#endif + /** Function typedef for the Linux request_threaded_irq() diff --git a/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/130-support-kernel-6.6.patch b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/130-support-kernel-6.6.patch index 407afc9bf2..f09fbd4284 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/130-support-kernel-6.6.patch +++ b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/130-support-kernel-6.6.patch @@ -1,14 +1,11 @@ --- a/src/drv_mei_cpe_linux.c +++ b/src/drv_mei_cpe_linux.c -@@ -2779,7 +2779,11 @@ static int MEI_InitModuleRegCharDev(cons +@@ -2779,7 +2779,7 @@ static int MEI_InitModuleRegCharDev(cons ("Using major number %d" MEI_DRV_CRLF, MAJOR(mei_devt))); } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) - mei_class = class_create(THIS_MODULE, devName); -+#else +- mei_class = class_create(THIS_MODULE, devName); + mei_class = class_create(devName); -+#endif if (IS_ERR(mei_class)) { PRN_DBG_USR_NL( MEI_DRV,MEI_DRV_PRN_LEVEL_HIGH, -- 2.30.2