Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 396480 Details for
Bug 531682
app-emulation/vmware-workstation-11.0.0.2305329 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch with fixed vmnet module with linux-3.19
3.19-vmnet-only.patch (text/plain), 1.91 KB, created by
Harris Landgarten
on 2015-02-15 01:33:11 UTC
(
hide
)
Description:
patch with fixed vmnet module with linux-3.19
Filename:
MIME Type:
Creator:
Harris Landgarten
Created:
2015-02-15 01:33:11 UTC
Size:
1.91 KB
patch
obsolete
>diff -u vmnet-only/driver.c vmnet-only.new/driver.c >--- vmnet-only/driver.c 2014-11-20 20:13:56.000000000 -0500 >+++ vmnet-only.new/driver.c 2015-02-09 11:53:18.000000000 -0500 >@@ -264,11 +264,17 @@ > struct file * filp) // IN: > { > int ret = -ENOTTY; >- >- if (filp && filp->f_op && filp->f_op->ioctl == VNetFileOpIoctl) { >- ret = VNetFileOpIoctl(filp->f_dentry->d_inode, filp, iocmd, ioarg); >- } >- return ret; >+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) >+ if (filp && filp->f_op && filp->f_op->ioctl == VNetFileOpIoctl) { >+ ret = VNetFileOpIoctl(filp->f_dentry->d_inode, filp, iocmd, ioarg); >+ } >+ return ret; >+#else >+ if (filp && filp->f_op && filp->f_op->ioctl == VNetFileOpIoctl) { >+ ret = VNetFileOpIoctl(filp->f_path.dentry->d_inode, filp, iocmd, ioarg); >+ } >+ return ret; >+#endif > } > > >@@ -1191,11 +1197,20 @@ > struct inode *inode = NULL; > long err; > >- if (filp && filp->f_dentry) { >- inode = filp->f_dentry->d_inode; >- } >- err = VNetFileOpIoctl(inode, filp, iocmd, ioarg); >- return err; >+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) >+ if (filp && filp->f_dentry) { >+ inode = filp->f_dentry->d_inode; >+ } >+ err = VNetFileOpIoctl(inode, filp, iocmd, ioarg); >+ return err; >+#else >+ if (filp && filp->f_path.dentry) { >+ inode = filp->f_path.dentry->d_inode; >+ } >+ err = VNetFileOpIoctl(inode, filp, iocmd, ioarg); >+ return err; >+#endif >+ > } > #endif > >diff -u vmnet-only/userif.c vmnet-only.new/userif.c >--- vmnet-only/userif.c 2014-11-20 20:13:56.000000000 -0500 >+++ vmnet-only.new/userif.c 2015-02-09 11:56:03.000000000 -0500 >@@ -523,7 +523,13 @@ > .iov_base = buf, > .iov_len = len, > }; >- return skb_copy_datagram_iovec(skb, 0, &iov, len); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) >+ return skb_copy_datagram_iovec(skb, 0, &iov, len); >+#else >+ struct iov_iter to; >+ iov_iter_init(&to, READ, &iov, 1, len); >+ return skb_copy_datagram_iter(skb, 0, &to, len); >+#endif > } > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 531682
:
393860
|
393862
|
393864
|
393866
|
393868
|
394828
|
396480
|
396482
|
396484
|
399520
|
399760
|
399762
|
399764
|
399766
|
399768
|
399770
|
400032
|
400034
|
405520
|
405522
|
410716
|
410718