wok-next diff ndiswrapper-driver/stuff/kernel-2.6.36.patch @ rev 20738

Up scons (3.0.1); add scons2 (2.5.1)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue May 29 21:13:51 2018 +0300 (2018-05-29)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ndiswrapper-driver/stuff/kernel-2.6.36.patch	Tue May 29 21:13:51 2018 +0300
     1.3 @@ -0,0 +1,27 @@
     1.4 +--- ndiswrapper-1.56.orig/driver/loader.c	2010-02-11 03:09:32.000000000 +0100
     1.5 ++++ ndiswrapper-1.56/driver/loader.c	2010-10-24 01:38:13.000000000 +0200
     1.6 +@@ -750,13 +750,13 @@
     1.7 + }
     1.8 + 
     1.9 + /* called with loader_mutex is down */
    1.10 +-static int wrapper_ioctl(struct inode *inode, struct file *file,
    1.11 ++static long wrapper_unlocked_ioctl(struct file *file,
    1.12 + 			 unsigned int cmd, unsigned long arg)
    1.13 + {
    1.14 + 	struct load_driver *load_driver;
    1.15 + 	struct load_device load_device;
    1.16 + 	struct load_driver_file load_bin_file;
    1.17 +-	int ret;
    1.18 ++	long ret;
    1.19 + 	void __user *addr = (void __user *)arg;
    1.20 + 
    1.21 + 	ENTER1("cmd: %u", cmd);
    1.22 +@@ -831,7 +831,7 @@
    1.23 + 
    1.24 + static struct file_operations wrapper_fops = {
    1.25 + 	.owner          = THIS_MODULE,
    1.26 +-	.ioctl		= wrapper_ioctl,
    1.27 ++	.unlocked_ioctl	= wrapper_unlocked_ioctl,
    1.28 + 	.release	= wrapper_ioctl_release,
    1.29 + };
    1.30 +