[openwrt/openwrt] ltq-vdsl-vr11-mei: fix compilation error with kernel 6.1

LEDE Commits lede-commits at lists.infradead.org
Sun Aug 27 10:27:40 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/520ade686b6d2a8ca04196423d7b44b3decda50a

commit 520ade686b6d2a8ca04196423d7b44b3decda50a
Author: Andre Heider <a.heider at gmail.com>
AuthorDate: Tue Aug 22 14:50:24 2023 +0200

    ltq-vdsl-vr11-mei: fix compilation error with kernel 6.1
    
    Define the old PDE_DATA marco to the new pde_data function.
    
    Signed-off-by: Andre Heider <a.heider at gmail.com>
---
 .../lantiq/ltq-vdsl-vr11-mei/patches/100-compat.patch       | 13 +++++++++++++
 .../patches/122-cp_linux-fix-compilation-warning.patch      |  4 ++--
 2 files changed, 15 insertions(+), 2 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 a2e42ccb03..74e88894d8 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
@@ -8,3 +8,16 @@
  MODULE_LICENSE ("GPL");
  #endif /* #ifdef MODULE*/
  
+--- a/src/drv_mei_cpe_linux.h
++++ b/src/drv_mei_cpe_linux.h
+@@ -110,6 +110,10 @@ 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/122-cp_linux-fix-compilation-warning.patch b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/122-cp_linux-fix-compilation-warning.patch
index 63a530b6c5..6f180a284e 100644
--- a/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/122-cp_linux-fix-compilation-warning.patch
+++ b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/122-cp_linux-fix-compilation-warning.patch
@@ -1,6 +1,6 @@
---- a/src/drv_mei_cpe_linux.c	
+--- a/src/drv_mei_cpe_linux.c
 +++ b/src/drv_mei_cpe_linux.c
-@@ -1267,7 +1267,9 @@ static long MEI_Ioctl( struct file *filp,
+@@ -1267,7 +1267,9 @@ static long MEI_Ioctl( struct file *filp
  MEI_IOCTL_RETURN:
  
     local_args.drv_ioctl.retCode = ret;




More information about the lede-commits mailing list