[gentoo-commits] gentoo-x86 commit in net-wireless/ndiswrapper/files: ndiswrapper-1.58-3.9.patch

[Christoph Mende (angelos)]

angelos     13/05/19 16:54:31

  Added:                ndiswrapper-1.58-3.9.patch
  Log:
  Fix compilation on linux 3.9 (bug #467956)
  
  (Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)

Revision  Changes    Path
1.1                  net-wireless/ndiswrapper/files/ndiswrapper-1.58-3.9.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ndiswrapper/files/ndiswrapper-1.58-3.9.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ndiswrapper/files/ndiswrapper-1.58-3.9.patch?rev=1.1&content-type=text/plain

Index: ndiswrapper-1.58-3.9.patch
===================================================================
diff --git a/driver/loader.c b/driver/loader.c
index 406e6ba..6f2113f 100644
--- a/driver/loader.c
+++ b/driver/loader.c
@@ -575,7 +575,11 @@ static int load_user_space_driver(struct load_driver *load_driver)
 	} else {
 		printk(KERN_INFO "%s: driver %s (%s) loaded\n",
 		       DRIVER_NAME, wrap_driver->name, wrap_driver->version);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
 		add_taint(TAINT_PROPRIETARY_MODULE);
+#else
+		add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_STILL_OK);
+#endif
 		EXIT1(return 0);
 	}
 }
diff --git a/driver/wrapper.c b/driver/wrapper.c
index f77c879..4fcbbe8 100644
--- a/driver/wrapper.c
+++ b/driver/wrapper.c
@@ -72,7 +72,11 @@ static void module_cleanup(void)
 static int __init wrapper_init(void)
 {
 #ifdef TAINT_OOT_MODULE
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
 	add_taint(TAINT_OOT_MODULE);
+#else
+	add_taint(TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
+#endif
 #endif
 	printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n",
 	       DRIVER_NAME, DRIVER_VERSION,