diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2010-11-09 01:43:59 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2010-11-09 01:43:59 (GMT) |
| commit | 6b218299785aedd78128a9c7831aff1a6eefdcb8 (patch) | |
| tree | 79f48e3bac89f7120496e6b3021072212fa6a780 /abs/core/ndiswrapper/kernel-2.6.36.patch | |
| parent | f33c5716af099ce4d779cf67f65204f11b551ed6 (diff) | |
| parent | e40ac065f9a09f99b37e898b8684d70a0984f399 (diff) | |
| download | linhes_pkgbuild-6b218299785aedd78128a9c7831aff1a6eefdcb8.zip linhes_pkgbuild-6b218299785aedd78128a9c7831aff1a6eefdcb8.tar.gz linhes_pkgbuild-6b218299785aedd78128a9c7831aff1a6eefdcb8.tar.bz2 | |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/ndiswrapper/kernel-2.6.36.patch')
| -rw-r--r-- | abs/core/ndiswrapper/kernel-2.6.36.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/abs/core/ndiswrapper/kernel-2.6.36.patch b/abs/core/ndiswrapper/kernel-2.6.36.patch new file mode 100644 index 0000000..63de303 --- /dev/null +++ b/abs/core/ndiswrapper/kernel-2.6.36.patch @@ -0,0 +1,27 @@ +--- ndiswrapper-1.56.orig/driver/loader.c 2010-02-11 03:09:32.000000000 +0100 ++++ ndiswrapper-1.56/driver/loader.c 2010-10-24 01:38:13.000000000 +0200 +@@ -750,13 +750,13 @@ + } + + /* called with loader_mutex is down */ +-static int wrapper_ioctl(struct inode *inode, struct file *file, ++static long wrapper_unlocked_ioctl(struct file *file, + unsigned int cmd, unsigned long arg) + { + struct load_driver *load_driver; + struct load_device load_device; + struct load_driver_file load_bin_file; +- int ret; ++ long ret; + void __user *addr = (void __user *)arg; + + ENTER1("cmd: %u", cmd); +@@ -831,7 +831,7 @@ + + static struct file_operations wrapper_fops = { + .owner = THIS_MODULE, +- .ioctl = wrapper_ioctl, ++ .unlocked_ioctl = wrapper_unlocked_ioctl, + .release = wrapper_ioctl_release, + }; + |