summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-05-12 15:11:40 (GMT)
committerJulian Andres Klode <jak@debian.org>2015-05-12 15:11:40 (GMT)
commitfe307aab912c55fb357670e5e838c353712a689b (patch)
treea4e72307051e1f9bba115e3ac849dc270d3ac6f6
parentcb7bd389c5042633fe6111ffe924bfa29779c7b4 (diff)
Add support for kernel 4.0
-rw-r--r--debian/patches/Support-kernel-4.0.patch41
-rw-r--r--debian/patches/series1
2 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/Support-kernel-4.0.patch b/debian/patches/Support-kernel-4.0.patch
new file mode 100644
index 0000000..97ef75d
--- /dev/null
+++ b/debian/patches/Support-kernel-4.0.patch
@@ -0,0 +1,41 @@
+From: Julian Andres Klode <jak@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;
diff --git a/debian/patches/series b/debian/patches/series
index 80bb096..a84282b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Please-enabled-hardened-build-flags.patch
Use-KERNELRELEASE-as-target-kernel-version.patch
Hardcode-etc-modprobe.d-ndiswrapper.conf.patch
kernel-3.14.patch
+Support-kernel-4.0.patch