diff -Nru ndiswrapper-1.60/debian/changelog ndiswrapper-1.60/debian/changelog --- ndiswrapper-1.60/debian/changelog 2019-05-09 18:40:40.000000000 -0300 +++ ndiswrapper-1.60/debian/changelog 2019-11-22 15:51:05.000000000 -0300 @@ -1,3 +1,13 @@ +ndiswrapper (1.60-6ubuntu0.2) bionic; urgency=medium + + [ Seth Forshee ] + * Add support for kernel 5.3 (LP: #1837889) + + [ Paolo Pisati ] + * Add support for kernel 5.4 (LP: #1848588) + + -- Thadeu Lima de Souza Cascardo Fri, 22 Nov 2019 15:51:05 -0300 + ndiswrapper (1.60-6ubuntu0.1) bionic; urgency=medium * Fix build for 5.0 (LP: #1813063) diff -Nru ndiswrapper-1.60/debian/patches/0010-Build-fixes-for-Linux-5.3.patch ndiswrapper-1.60/debian/patches/0010-Build-fixes-for-Linux-5.3.patch --- ndiswrapper-1.60/debian/patches/0010-Build-fixes-for-Linux-5.3.patch 1969-12-31 21:00:00.000000000 -0300 +++ ndiswrapper-1.60/debian/patches/0010-Build-fixes-for-Linux-5.3.patch 2019-11-22 15:49:18.000000000 -0300 @@ -0,0 +1,16 @@ +Index: ndiswrapper-1.60/driver/ntoskernel.h +=================================================================== +--- ndiswrapper-1.60.orig/driver/ntoskernel.h ++++ ndiswrapper-1.60/driver/ntoskernel.h +@@ -109,7 +109,11 @@ static cpumask_t cpumasks[NR_CPUS]; + #endif /* CONFIG_SMP */ + + #ifndef tsk_cpus_allowed ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0) + #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) ++#else ++#define tsk_cpus_allowed(tsk) ((tsk)->cpus_ptr) ++#endif + #endif + + #ifndef __packed diff -Nru ndiswrapper-1.60/debian/patches/0011-Build-fixes-for-Linux-5.4.patch ndiswrapper-1.60/debian/patches/0011-Build-fixes-for-Linux-5.4.patch --- ndiswrapper-1.60/debian/patches/0011-Build-fixes-for-Linux-5.4.patch 1969-12-31 21:00:00.000000000 -0300 +++ ndiswrapper-1.60/debian/patches/0011-Build-fixes-for-Linux-5.4.patch 2019-11-22 15:49:25.000000000 -0300 @@ -0,0 +1,25 @@ +Description: Fix FTBFS with kernel 5.4 +Author: Paolo Pisati +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1848588 + +--- a/driver/wrapndis.c ++++ b/driver/wrapndis.c +@@ -457,10 +457,18 @@ + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; + sg_element++; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) + sg_element->length = frag->size; ++#else ++ sg_element->length = skb_frag_size(frag); ++#endif + sg_element->address = + pci_map_page(wnd->wd->pci.pdev, skb_frag_page(frag), ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) + frag->page_offset, frag->size, ++#else ++ skb_frag_off(frag), skb_frag_size(frag), ++#endif + PCI_DMA_TODEVICE); + TRACE3("%llx, %u", sg_element->address, sg_element->length); + } diff -Nru ndiswrapper-1.60/debian/patches/series ndiswrapper-1.60/debian/patches/series --- ndiswrapper-1.60/debian/patches/series 2019-05-09 18:40:40.000000000 -0300 +++ ndiswrapper-1.60/debian/patches/series 2019-11-22 15:49:43.000000000 -0300 @@ -7,3 +7,5 @@ 0007-Build-fixes-for-Linux-4.13.patch 0008-Build-fixes-for-Linux-4.15.patch 0009-kernel-5.0-Replace-do_gettimeofday-with-ktime_get_re.patch +0010-Build-fixes-for-Linux-5.3.patch +0011-Build-fixes-for-Linux-5.4.patch