Bug#1029135: xtrx-dkms: xtrx module fails to build for kernel version 6.1

[Ying-Chun Liu (PaulLiu)]

Hi all,

I plan to do NMU to fix this bug. The debdiff is as attachment.



Yours,
Paul

diff -Nru xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/changelog 
xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/changelog
--- xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/changelog        2022-11-17 
13:30:42.000000000 +0800
+++ xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/changelog        2023-01-21 
03:20:02.000000000 +0800
@@ -1,3 +1,11 @@
+xtrx-dkms (0.0.1+git20190320.5ae3a3e-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix dkms build failure with kernel 6.1 (Closes: #1029135)
+    - add debian/patches/0002-xtrx.c-fix-build-error-with-kernel-6.1.patch
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org>  Sat, 21 Jan 2023 03:20:02 
+0800
+
 xtrx-dkms (0.0.1+git20190320.5ae3a3e-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru 
xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/0002-xtrx.c-fix-build-error-with-kernel-6.1.patch
 
xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/0002-xtrx.c-fix-build-error-with-kernel-6.1.patch
--- 
xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/0002-xtrx.c-fix-build-error-with-kernel-6.1.patch
        1970-01-01 08:00:00.000000000 +0800
+++ 
xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/0002-xtrx.c-fix-build-error-with-kernel-6.1.patch
        2023-01-21 03:20:02.000000000 +0800
@@ -0,0 +1,27 @@
+Description: xtrx.c: fix build error with kernel 6.1
+ uart_ops.set_termios type changes a little in kernel 6.1. Thus
+ we need to change xtrx_uart_set_termios() third parameter as a
+ const pointer when building with kernel version >= 6.1
+Forwarded: https://github.com/xtrx-sdr/xtrx_linux_pcie_drv/pull/15
+Author: Ying-Chun Liu (PaulLiu) <paul...@debian.org>
+Last-Update: 2023-01-21
+Index: xtrx-dkms-0.0.1+git20190320.5ae3a3e/xtrx.c
+===================================================================
+--- xtrx-dkms-0.0.1+git20190320.5ae3a3e.orig/xtrx.c
++++ xtrx-dkms-0.0.1+git20190320.5ae3a3e/xtrx.c
+@@ -361,8 +361,13 @@ static void xtrx_uart_shutdown(struct ua
+ }
+ 
+ static void xtrx_uart_set_termios(struct uart_port *port,
+-                               struct ktermios *new,
+-                               struct ktermios *old)
++                                struct ktermios *new,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
++                                struct ktermios *old
++#else
++                                const struct ktermios *old
++#endif
++      )
+ {
+       unsigned long flags;
+ 
diff -Nru xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/series 
xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/series
--- xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/series   2022-11-17 
13:30:42.000000000 +0800
+++ xtrx-dkms-0.0.1+git20190320.5ae3a3e/debian/patches/series   2023-01-21 
03:20:02.000000000 +0800
@@ -1 +1,2 @@
 0001-xtrx-fix-PCI-DMA-allow-free-with-kernel-5.18.patch
+0002-xtrx.c-fix-build-error-with-kernel-6.1.patch

I'll wait for 3 days to see if anyone objects. And I'll upload it to delay/10 queue.

OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key

OpenPGP_signature
Description: OpenPGP digital signature