diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2010-12-14 18:49:44 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2010-12-14 18:49:44 +0000 |
| commit | 74958949290522b389bc0dd894219561921d5015 (patch) | |
| tree | 14c1474465320fec9e89ce68e14fbb546bb16b16 /net-wireless/ndiswrapper/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-74958949290522b389bc0dd894219561921d5015.tar.gz gentoo-2-74958949290522b389bc0dd894219561921d5015.tar.bz2 gentoo-2-74958949290522b389bc0dd894219561921d5015.zip | |
Imported upstream patch for 2.6.36 (bug 342159)
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/ndiswrapper/files')
| -rw-r--r-- | net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch new file mode 100644 index 000000000000..1c32151360cd --- /dev/null +++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch @@ -0,0 +1,29 @@ +--- trunk/ndiswrapper/driver/loader.c 2010/09/13 08:35:26 2725 ++++ trunk/ndiswrapper/driver/loader.c 2010/09/13 08:43:15 2726 +@@ -750,8 +750,13 @@ + } + + /* called with loader_mutex is down */ ++#ifdef HAVE_UNLOCKED_IOCTL ++static long wrapper_ioctl(struct file *file, ++ unsigned int cmd, unsigned long arg) ++#else + static int wrapper_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) ++#endif + { + struct load_driver *load_driver; + struct load_device load_device; +@@ -831,7 +836,12 @@ + + static struct file_operations wrapper_fops = { + .owner = THIS_MODULE, ++ ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = wrapper_ioctl, ++#else + .ioctl = wrapper_ioctl, ++#endif + .release = wrapper_ioctl_release, + }; + |