Author: leigh123linux Update of /cvs/free/rpms/ndiswrapper-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22174 Modified Files: ndiswrapper-kmod-nomodinfo.patch ndiswrapper-kmod.spec Added Files: kernel-3.14.patch Log Message: * Thu Apr 24 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.59-6 - patch for 3.14 kernel kernel-3.14.patch: crt.c | 2 +- ntoskernel.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE kernel-3.14.patch --- Description: Kernel 3.14 changes This is a diff consisting of upstream revisions 3199, 3201, 3203. * Use prandom_seed() instead of net_srandom() on Linux 3.8+ net_srandom() is going away. * Avoid preempt_enable_no_resched(), it's no longer available for modules Use preempt_enable() instead. This makes nt_spin_unlock_irqrestore() fully complementary to nt_spin_lock_irqsave(). * Define reinit_completion() based on the kernel version Checking for INIT_COMPLETION was a temporary hack needed before Linux 3.13-rc1 was released. The last patch might not be really related to kernel 3.14, but is included as well. Origin: upstream, http://sourceforge.net/p/ndiswrapper/code/ --- a/driver/crt.c +++ b/driver/crt.c @@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3) noregparm void WIN_FUNC(_win_srand,1) (UINT seed) { - net_srandom(seed); + prandom_seed((__force u32)(seed)); } noregparm int WIN_FUNC(rand,0) --- a/driver/ntoskernel.h +++ b/driver/ntoskernel.h @@ -347,7 +347,7 @@ static inline void netif_poll_disable(st #define netdev_notifier_info_to_dev(x) ((struct net_device *)(x)) #endif -#ifdef INIT_COMPLETION +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) static inline void reinit_completion(struct completion *x) { INIT_COMPLETION(*x); @@ -797,9 +797,8 @@ do { \ #define nt_spin_unlock_irqrestore(lock, flags) \ do { \ nt_spin_unlock(lock); \ - preempt_enable_no_resched(); \ + preempt_enable(); \ local_irq_restore(flags); \ - preempt_check_resched(); \ } while (0) static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length) ndiswrapper-kmod-nomodinfo.patch: Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: ndiswrapper-kmod-nomodinfo.patch =================================================================== RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-20/ndiswrapper-kmod-nomodinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ndiswrapper-kmod-nomodinfo.patch 11 Jan 2012 21:20:28 -0000 1.1 +++ ndiswrapper-kmod-nomodinfo.patch 24 Apr 2014 10:53:02 -0000 1.2 @@ -1,7 +1,7 @@ diff -up ndiswrapper-1.57/driver/Makefile.orig ndiswrapper-1.57/driver/Makefile --- ndiswrapper-1.57/driver/Makefile.orig 2012-01-11 22:04:35.103054918 +0100 +++ ndiswrapper-1.57/driver/Makefile 2012-01-11 22:06:37.880672013 +0100 -@@ -192,8 +192,8 @@ clean: +@@ -191,8 +191,8 @@ clean: rm -rf .tmp_versions install: config_check $(MODULE) Index: ndiswrapper-kmod.spec =================================================================== RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-20/ndiswrapper-kmod.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- ndiswrapper-kmod.spec 16 Apr 2014 11:40:20 -0000 1.82 +++ ndiswrapper-kmod.spec 24 Apr 2014 10:53:02 -0000 1.83 @@ -3,20 +3,21 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +%global buildforkernels current #global pre rc1 Summary: Ndiswrapper kernel module Name: ndiswrapper-kmod Version: 1.59 -Release: 5%{?pre}%{?dist}.18 +Release: 6%{?pre}%{?dist} License: GPLv2 Group: System Environment/Kernel URL: http://ndiswrapper.sourceforge.net Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz Source11: ndiswrapper-kmodtool-excludekernel-filterfile Patch0: ndiswrapper-kmod-nomodinfo.patch +Patch1: kernel-3.14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 @@ -48,6 +49,7 @@ %setup -q -c -T -a 0 -n %{name}-%{version}%{?pre} (cd ndiswrapper-%{version}%{?pre} ; %patch0 -p1 -b .orig +%patch1 -p1 -b .orig ) sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile for kernel_version in %{?kernel_versions} ; do @@ -75,6 +77,9 @@ %changelog +* Thu Apr 24 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.59-6 +- patch for 3.14 kernel + * Wed Apr 16 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.59-5.18 - Rebuilt for kernel