rpms/ndiswrapper-kmod/F-20 Support-kernel-4.0.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.131, 1.132

[Leigh Scott]

Author: leigh123linux

Update of /cvs/free/rpms/ndiswrapper-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28418

Modified Files:
	ndiswrapper-kmod.spec 
Added Files:
	Support-kernel-4.0.patch 
Log Message:
* Mon May 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 1.59-7
- Patch for 4.0.0 kernel


Support-kernel-4.0.patch:
 ndis.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE Support-kernel-4.0.patch ---
From: Julian Andres Klode <jak at debian.org>
Date: Tue, 12 May 2015 17:11:11 +0200
Subject: Support kernel 4.0

---
 driver/ndis.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/driver/ndis.c b/driver/ndis.c
index 9ace34b..fafd2e7 100644
--- a/driver/ndis.c
+++ b/driver/ndis.c
@@ -25,6 +25,10 @@
 #define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE
 #define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+#define strncasecmp strnicmp
+#endif
+
 static struct work_struct ndis_work;
 static struct nt_list ndis_work_list;
 static spinlock_t ndis_work_list_lock;
@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char *keyname, int length,
 	struct wrap_device_setting *setting;
 	mutex_lock(&loader_mutex);
 	nt_list_for_each_entry(setting, setting_list, list) {
-		if (strnicmp(keyname, setting->name, length) == 0) {
+		if (strncasecmp(keyname, setting->name, length) == 0) {
 			TRACE2("setting %s='%s'", keyname, setting->value);
 			mutex_unlock(&loader_mutex);
 			*param = ndis_encode_setting(setting, type);
@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4)
 
 	mutex_lock(&loader_mutex);
 	nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) {
-		if (strnicmp(keyname, setting->name, ansi.length) == 0) {
+		if (strncasecmp(keyname, setting->name, ansi.length) == 0) {
 			mutex_unlock(&loader_mutex);
 			if (ndis_decode_setting(setting, param))
 				*status = NDIS_STATUS_FAILURE;


Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-20/ndiswrapper-kmod.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ndiswrapper-kmod.spec	24 May 2015 15:57:15 -0000	1.131
+++ ndiswrapper-kmod.spec	25 May 2015 13:52:08 -0000	1.132
@@ -3,12 +3,12 @@
 # "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
 
 Summary:	Ndiswrapper kernel module
 Name: 		ndiswrapper-kmod
 Version: 	1.59
-Release: 	6%{?dist}.47
+Release: 	7%{?dist}
 License: 	GPLv2
 Group: 		System Environment/Kernel
 URL:		http://ndiswrapper.sourceforge.net
@@ -16,6 +16,7 @@
 Source11:	ndiswrapper-kmodtool-excludekernel-filterfile
 Patch0:		ndiswrapper-kmod-nomodinfo.patch
 Patch1:         kernel-3.14.patch
+Patch2:         Support-kernel-4.0.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 @@
 (cd ndiswrapper-%{version}%{?pre} ; 
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
+%patch2 -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
+* Mon May 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 1.59-7
+- Patch for 4.0.0 kernel
+
 * Sun May 24 2015 Nicolas Chauvet <kwizart at gmail.com> - 1.59-6.47
 - Rebuilt for kernel