wok-stable annotate ndiswrapper-driver/stuff/kernel-2.6.36.patch @ rev 12060
Up: dovecot (2.1.1) + improve receipt
| author | Eric Joseph-Alexandre <erjo@slitaz.org> |
|---|---|
| date | Thu Mar 08 14:32:42 2012 +0100 (2012-03-08) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@7135 | 1 --- ndiswrapper-1.56.orig/driver/loader.c 2010-02-11 03:09:32.000000000 +0100 |
| slaxemulator@7135 | 2 +++ ndiswrapper-1.56/driver/loader.c 2010-10-24 01:38:13.000000000 +0200 |
| slaxemulator@7135 | 3 @@ -750,13 +750,13 @@ |
| slaxemulator@7135 | 4 } |
| slaxemulator@7135 | 5 |
| slaxemulator@7135 | 6 /* called with loader_mutex is down */ |
| slaxemulator@7135 | 7 -static int wrapper_ioctl(struct inode *inode, struct file *file, |
| slaxemulator@7135 | 8 +static long wrapper_unlocked_ioctl(struct file *file, |
| slaxemulator@7135 | 9 unsigned int cmd, unsigned long arg) |
| slaxemulator@7135 | 10 { |
| slaxemulator@7135 | 11 struct load_driver *load_driver; |
| slaxemulator@7135 | 12 struct load_device load_device; |
| slaxemulator@7135 | 13 struct load_driver_file load_bin_file; |
| slaxemulator@7135 | 14 - int ret; |
| slaxemulator@7135 | 15 + long ret; |
| slaxemulator@7135 | 16 void __user *addr = (void __user *)arg; |
| slaxemulator@7135 | 17 |
| slaxemulator@7135 | 18 ENTER1("cmd: %u", cmd); |
| slaxemulator@7135 | 19 @@ -831,7 +831,7 @@ |
| slaxemulator@7135 | 20 |
| slaxemulator@7135 | 21 static struct file_operations wrapper_fops = { |
| slaxemulator@7135 | 22 .owner = THIS_MODULE, |
| slaxemulator@7135 | 23 - .ioctl = wrapper_ioctl, |
| slaxemulator@7135 | 24 + .unlocked_ioctl = wrapper_unlocked_ioctl, |
| slaxemulator@7135 | 25 .release = wrapper_ioctl_release, |
| slaxemulator@7135 | 26 }; |
| slaxemulator@7135 | 27 |