From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 76C3C1387B2 for ; Sat, 11 Oct 2014 15:52:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10200E0D41; Sat, 11 Oct 2014 15:52:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F30BE0D3C for ; Sat, 11 Oct 2014 15:52:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3509334040F for ; Sat, 11 Oct 2014 15:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6417792A for ; Sat, 11 Oct 2014 15:52:46 +0000 (UTC) From: "Evan Teran" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Evan Teran" Message-ID: <1413042223.1a5f058793742777d3e60ca3b930fc54bb42a344.eteran@gentoo> Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/ X-VCS-Repository: proj/vmware X-VCS-Files: app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild X-VCS-Directories: app-emulation/vmware-modules/ app-emulation/vmware-modules/files/ X-VCS-Committer: eteran X-VCS-Committer-Name: Evan Teran X-VCS-Revision: 1a5f058793742777d3e60ca3b930fc54bb42a344 X-VCS-Branch: master Date: Sat, 11 Oct 2014 15:52:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 254164ee-b5b0-4b02-837a-5a8d0f3ae090 X-Archives-Hash: 877ca1509610d60cd4b1de421fb9ab99 commit: 1a5f058793742777d3e60ca3b930fc54bb42a344 Author: Evan Teran gmail com> AuthorDate: Sat Oct 11 15:43:43 2014 +0000 Commit: Evan Teran gmail com> CommitDate: Sat Oct 11 15:43:43 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=1a5f0587 now supports 3.13.0 --- .../vmware-modules/files/279-3.13-00-vmnet.patch | 36 ++++++++++++++++++++++ .../vmware-modules/vmware-modules-279.2-r1.ebuild | 1 + 2 files changed, 37 insertions(+) diff --git a/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch new file mode 100644 index 0000000..4e9d7e9 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-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 + #include ++#include + #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0) + # include + #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-279.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild index 1212ca8..cd4419a 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild @@ -90,6 +90,7 @@ src_prepare() { kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-hub.patch" kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch" + kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch" # Allow user patches so they can support RC kernels and whatever else