[Pkg-virtualbox-commits] [virtualbox] 01/01: Add patch from Adam Borowski to fix a build failure with kernel 4.7

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit 135040b61e025a6b4fd645c210fc8398db9d93dc
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon May 30 12:32:20 2016 +0200

    Add patch from Adam Borowski to fix a build failure with kernel 4.7
---
 debian/changelog                    |  7 +++++++
 debian/patches/fix-kernel-4.7.patch | 14 ++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d8ae8b8..9cdad32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (5.0.20-dfsg-3) UNRELEASED; urgency=medium
+
+  [ Adam Borowski ]
+  * debian/patches/fix-kernel-4.7.patch (Closes: #825819)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 30 May 2016 12:30:24 +0200
+
 virtualbox (5.0.20-dfsg-2) unstable; urgency=medium
 
   [ Guillem Jover ]
diff --git a/debian/patches/fix-kernel-4.7.patch b/debian/patches/fix-kernel-4.7.patch
new file mode 100644
index 0000000..2ca9275
--- /dev/null
+++ b/debian/patches/fix-kernel-4.7.patch
@@ -0,0 +1,14 @@
+--- virtualbox-5.0.20/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c.orig	2016-04-28 15:14:24.000000000 +0200
++++ virtualbox-5.0.20/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c		2016-05-30 11:07:38.806490593 +0200
+@@ -153,7 +153,11 @@
+     pPriv->Stats.tx_packets++;
+     pPriv->Stats.tx_bytes += pSkb->len;
+     /* Update transmission time stamp. */
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++    netif_trans_update(pNetDev);
++# else
+     pNetDev->trans_start = jiffies;
++# endif
+     /* Nothing else to do, just free the sk_buff. */
+     dev_kfree_skb(pSkb);
+     return 0;
diff --git a/debian/patches/series b/debian/patches/series
index 90bc7be..0591094 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 fix-gcc-pie.patch
+fix-kernel-4.7.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git