diff options
author | 2014-10-09 17:20:45 -0400 | |
---|---|---|
committer | 2014-10-09 17:20:45 -0400 | |
commit | a47d968589d7559e72d5f8cc4e957ea3b9fb78d2 (patch) | |
tree | 4a8b905d639094467e47a9da5e4240182f5ce74d /app-emulation/vmware-modules | |
parent | compiles cleanly with 3.11, moving onto 3.12 (diff) | |
download | vmware-a47d968589d7559e72d5f8cc4e957ea3b9fb78d2.tar.gz vmware-a47d968589d7559e72d5f8cc4e957ea3b9fb78d2.tar.bz2 vmware-a47d968589d7559e72d5f8cc4e957ea3b9fb78d2.zip |
compiles with 3.12/3.13, moving onto 3.14
Diffstat (limited to 'app-emulation/vmware-modules')
-rw-r--r-- | app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch | 36 | ||||
-rw-r--r-- | app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 2 |
2 files changed, 37 insertions, 1 deletions
diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch new file mode 100644 index 0000000..4e9d7e9 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch @@ -0,0 +1,36 @@ +--- work/vmnet-only/filter.c 2013-08-27 20:29:04.000000000 +0100 ++++ patched/vmnet-only/filter.c 2014-01-26 01:09:05.184893854 +0000 +@@ -27,6 +27,7 @@ + #include "compat_module.h" + #include <linux/mutex.h> + #include <linux/netdevice.h> ++#include <linux/version.h> + #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0) + # include <linux/module.h> + #else +@@ -203,7 +204,11 @@ + #endif + + static unsigned int ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) + VNetFilterHookFn(unsigned int hooknum, // IN: ++#else ++VNetFilterHookFn(const struct nf_hook_ops *ops, // IN: ++#endif + #ifdef VMW_NFHOOK_USES_SKB + struct sk_buff *skb, // IN: + #else +@@ -252,7 +257,12 @@ + + /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */ + /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */ +- transmit = (hooknum == VMW_NF_INET_POST_ROUTING); ++ ++ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) ++ transmit = (hooknum == VMW_NF_INET_POST_ROUTING); ++ #else ++ transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING); ++ #endif + + packetHeader = compat_skb_network_header(skb); + ip = (struct iphdr*)packetHeader; diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 7b2771a..e922472 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -80,7 +80,7 @@ src_prepare() { kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch" kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch" - + kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch" |