public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabio Rossi" <rossi.f@inwind.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
Date: Mon, 30 May 2016 21:52:49 +0000 (UTC)	[thread overview]
Message-ID: <1464645044.92a78cb3305fc182764cb0c6b2c44892dcc35212.fabio@gentoo> (raw)

commit:     92a78cb3305fc182764cb0c6b2c44892dcc35212
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Mon May 30 21:50:44 2016 +0000
Commit:     Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Mon May 30 21:50:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=92a78cb3

app-emulation/vmware-modules: add support to kernel 4.7

Fix compilation with latest 4.7-rc1 taking example from
kernel commit 860e9538a9482bb84589f7d0718a7e6d0a944d58

 .../vmware-modules/files/304-4.7-00-trans_start.patch         | 11 +++++++++++
 .../vmware-modules/files/308-4.07-00-trans_start.patch        | 11 +++++++++++
 app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild   |  1 +
 app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild    |  1 +
 4 files changed, 24 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
new file mode 100644
index 0000000..751924f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
@@ -0,0 +1,11 @@
+--- ./vmnet-only/netif.c.old	2016-05-19 20:13:14.259914206 +0200
++++ ./vmnet-only/netif.c	2016-05-19 20:13:21.250914596 +0200
+@@ -465,7 +465,7 @@
+    VNetSend(&netIf->port.jack, skb);
+ 
+    netIf->stats.tx_packets++;
+-   dev->trans_start = jiffies;
++   netif_trans_update(dev);
+ 
+    return 0;
+ }

diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
new file mode 100644
index 0000000..751924f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
@@ -0,0 +1,11 @@
+--- ./vmnet-only/netif.c.old	2016-05-19 20:13:14.259914206 +0200
++++ ./vmnet-only/netif.c	2016-05-19 20:13:21.250914596 +0200
+@@ -465,7 +465,7 @@
+    VNetSend(&netIf->port.jack, skb);
+ 
+    netIf->stats.tx_packets++;
+-   dev->trans_start = jiffies;
++   netif_trans_update(dev);
+ 
+    return 0;
+ }

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index c56f4de..665965c 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -102,6 +102,7 @@ src_prepare() {
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
 	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
 	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index a7e1daa..1bfbcb4 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -102,6 +102,7 @@ src_prepare() {
 	kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
 	kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
 	kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
+	kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user


             reply	other threads:[~2016-05-30 21:52 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-30 21:52 Fabio Rossi [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-12-05  0:16 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/ Fabio Rossi
2017-11-09 21:56 Fabio Rossi
2017-11-09 21:56 Fabio Rossi
2017-11-09 21:56 Fabio Rossi
2017-08-22 10:02 Fabio Rossi
2016-08-05  7:29 Fabio Rossi
2016-03-18 23:33 Andreas Hüttel
2016-03-18  3:16 Evan Teran
2016-03-17  2:03 Evan Teran
2016-03-17  1:44 Evan Teran
2015-07-10 23:42 Evan Teran
2015-07-10 23:17 Evan Teran
2014-10-11 21:54 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-11 15:52 Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-10 13:55 Evan Teran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464645044.92a78cb3305fc182764cb0c6b2c44892dcc35212.fabio@gentoo \
    --to=rossi.f@inwind.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox