wok-6.x
annotate ndiswrapper-driver64/stuff/kernel-2.6.36.patch @ rev 22620
updated cups, cups-dev, cups-doc, cups-pam and libcups (2.0.2 -> 2.3.1)
| author |
Hans-G?nter Theisgen |
| date |
Sun Jan 12 14:31:51 2020 +0100 (2020-01-12) |
| parents |
|
| children |
|
| rev |
line source |
|
pascal@20394
|
1 --- ndiswrapper-1.56.orig/driver/loader.c 2010-02-11 03:09:32.000000000 +0100
|
|
pascal@20394
|
2 +++ ndiswrapper-1.56/driver/loader.c 2010-10-24 01:38:13.000000000 +0200
|
|
pascal@20394
|
3 @@ -750,13 +750,13 @@
|
|
pascal@20394
|
4 }
|
|
pascal@20394
|
5
|
|
pascal@20394
|
6 /* called with loader_mutex is down */
|
|
pascal@20394
|
7 -static int wrapper_ioctl(struct inode *inode, struct file *file,
|
|
pascal@20394
|
8 +static long wrapper_unlocked_ioctl(struct file *file,
|
|
pascal@20394
|
9 unsigned int cmd, unsigned long arg)
|
|
pascal@20394
|
10 {
|
|
pascal@20394
|
11 struct load_driver *load_driver;
|
|
pascal@20394
|
12 struct load_device load_device;
|
|
pascal@20394
|
13 struct load_driver_file load_bin_file;
|
|
pascal@20394
|
14 - int ret;
|
|
pascal@20394
|
15 + long ret;
|
|
pascal@20394
|
16 void __user *addr = (void __user *)arg;
|
|
pascal@20394
|
17
|
|
pascal@20394
|
18 ENTER1("cmd: %u", cmd);
|
|
pascal@20394
|
19 @@ -831,7 +831,7 @@
|
|
pascal@20394
|
20
|
|
pascal@20394
|
21 static struct file_operations wrapper_fops = {
|
|
pascal@20394
|
22 .owner = THIS_MODULE,
|
|
pascal@20394
|
23 - .ioctl = wrapper_ioctl,
|
|
pascal@20394
|
24 + .unlocked_ioctl = wrapper_unlocked_ioctl,
|
|
pascal@20394
|
25 .release = wrapper_ioctl_release,
|
|
pascal@20394
|
26 };
|
|
pascal@20394
|
27
|