Date: Monday, September 11, 2017 @ 04:56:14 Author: felixonmars Revision: 256867
upgpkg: ndiswrapper-dkms 1.61-3 fix build with linux 4.13+ Added: ndiswrapper-dkms/trunk/linux-4.13.patch Modified: ndiswrapper-dkms/trunk/PKGBUILD ------------------+ PKGBUILD | 12 +++++++----- linux-4.13.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-11 04:27:58 UTC (rev 256866) +++ PKGBUILD 2017-09-11 04:56:14 UTC (rev 256867) @@ -4,7 +4,7 @@ pkgname=ndiswrapper-dkms pkgver=1.61 -pkgrel=2 +pkgrel=3 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors.Use with DKMS" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/ndiswrapper/" @@ -14,14 +14,16 @@ provides=('ndiswrapper') conflicts=('ndiswrapper') source=("$pkgname-$pkgver.tar.gz::https://github.com/pgiri/ndiswrapper/archive/v$pkgver.tar.gz" - 'dkms.conf' 'linux-4.11.patch') -md5sums=('1267784d65a8ba6a92884cf6f3bffb9a' - '801e409f0b93a0434e5c923831c49d50' - 'c471bffbfb1f9256a33ca40284856bfc') + 'dkms.conf' 'linux-4.11.patch' 'linux-4.13.patch') +sha512sums=('85f550f2952137529e0e9855f4d94b7bbc64cbf8a84a31c1b75a4be09d97478a997e64fa6e1ff4e0d29a97a79fc3d4dab1ebdaa9edb3d627a215f47aa4d52823' + '9fce255fc02ddf6e939dc61a5e29c0ea5fa1a31ecc3c390081bc53aa1cd48eddf5db621f0a1cb909634529d4ccc2995eea8827be8eb5807b34dc17e15045ecf4' + '5350308406457658fb31c378d6f3dd2a34c7331aebe5bdc80744bf955f1144e88181441704ccc7532f55d6fbe8d410440fb8838c2955d688dde4b55f74fc6ba5' + 'de026a271cbfbefee99bc00a13c50be87294e5e2c5407d23cff6ce2d2a0c853542ce4f7e3e150741c7e8e32466fb1ab7cab266957da5bcca8376fb0f38e94482') prepare() { cd ndiswrapper-$pkgver patch -p1 -i ../linux-4.11.patch + patch -p1 -i ../linux-4.13.patch } build() { Added: linux-4.13.patch =================================================================== --- linux-4.13.patch (rev 0) +++ linux-4.13.patch 2017-09-11 04:56:14 UTC (rev 256867) @@ -0,0 +1,27 @@ +commit eeac7ab831b3097005dadc64dd323f54ade30323 +Author: Felix Yan <felixonm...@archlinux.org> +Date: Mon Sep 11 12:52:36 2017 +0800 + + Add support for linux 4.13+ + +diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h +index f1c52e51..1422bd4d 100644 +--- a/ndiswrapper/driver/ntoskernel.h ++++ b/ndiswrapper/driver/ntoskernel.h +@@ -119,9 +119,16 @@ static cpumask_t cpumasks[NR_CPUS]; + */ + #include <asm/dma-mapping.h> + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) + #define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle) \ + dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \ + GFP_KERNEL | __GFP_REPEAT) ++#else ++#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle) \ ++ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \ ++ GFP_KERNEL | __GFP_RETRY_MAYFAIL) ++#endif ++ + #define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle) \ + dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle) + #define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction) \