diff options
| author |   Evan Teran <evan.teran@gmail.com> | 2015-09-04 23:53:34 +0200 |
|---|---|---|
| committer |   Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2015-09-04 23:55:08 +0200 |
| commit | 96f8da4ea50bfcef9ff3eda1e56112bab1e143e0 (patch) | |
| tree | 246cf386312b7ceafe6d02a8299c86e653c77fba /app-emulation/vmware-modules/files/304-3.15-00-vsock.patch | |
| parent | dev-ruby/metasploit-credential: fix improperly imported ebuild from Pentoo (diff) | |
| download | gentoo-96f8da4ea50bfcef9ff3eda1e56112bab1e143e0.tar.gz gentoo-96f8da4ea50bfcef9ff3eda1e56112bab1e143e0.tar.bz2 gentoo-96f8da4ea50bfcef9ff3eda1e56112bab1e143e0.zip | |
app-emulation/vmware-modules: Updates, adding versions for VMware Workstation 10 and 11
Diffstat (limited to 'app-emulation/vmware-modules/files/304-3.15-00-vsock.patch')
| -rw-r--r-- | app-emulation/vmware-modules/files/304-3.15-00-vsock.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch b/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch new file mode 100644 index 000000000000..9e8d9d1a32f7 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch @@ -0,0 +1,46 @@ +removing the no longer existing second parameter to sk_data_ready +doesn't seem it ever served a purpose. + +diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c +--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500 ++++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400 +@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk, + vsk = vsock_sk(sk); + PKT_FIELD(vsk, sentWaitingRead) = FALSE; + #endif +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + +diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c +--- vsock-only/linux/notifyQState.c 2013-11-05 23:33:27.000000000 -0500 ++++ vsock-only.new/linux/notifyQState.c 2014-10-05 23:46:33.231303931 -0400 +@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk, + struct sockaddr_vm *dst, // IN: unused + struct sockaddr_vm *src) // IN: unused + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + +@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct + } + + /* See the comment in VSockVmciNotifyPktSendPostEnqueue */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + return err; |