[Pkg-virtualbox-commits] [virtualbox] 01/30: Fix VBox network interface error on Linux 3.11

[Ritesh Raj Sarraf]

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

rrs pushed a commit to branch master
in repository virtualbox.

commit 9b2bc93acc13ff4e390d8d6ef97d8b1e680f486f
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Fri Sep 13 13:29:48 2013 -0400

    Fix VBox network interface error on Linux 3.11
---
 debian/changelog                           |  7 +++++++
 debian/patches/38-linux-3.11-vboxnet.patch | 17 +++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 80638c5..4b61d4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.2.16-dfsg-3) UNRELEASED; urgency=low
+
+  * Fix VBox network interface error on Linux 3.11
+    - Add 38-linux-3.11-vboxnet.patch 
+
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Fri, 13 Sep 2013 13:25:29 -0400
+
 virtualbox (4.2.16-dfsg-2) unstable; urgency=low
 
   [ Whoopie ]
diff --git a/debian/patches/38-linux-3.11-vboxnet.patch b/debian/patches/38-linux-3.11-vboxnet.patch
new file mode 100644
index 0000000..ec16ab9
--- /dev/null
+++ b/debian/patches/38-linux-3.11-vboxnet.patch
@@ -0,0 +1,17 @@
+Fix vbox network interface error in linux 3.11. Patch taken from upstream at ticket #12001
+Index: virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+===================================================================
+--- virtualbox.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	2013-09-13 13:16:20.016285000 -0400
++++ virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	2013-09-13 13:22:15.460285000 -0400
+@@ -1804,7 +1804,11 @@
+ 
+ {
+     PVBOXNETFLTINS      pThis = VBOX_FLT_NB_TO_INST(self);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++    struct net_device  *pDev  = netdev_notifier_info_to_dev(ptr);
++#else
+     struct net_device  *pDev  = (struct net_device *)ptr;
++#endif
+     int                 rc    = NOTIFY_OK;
+ 
+     Log(("VBoxNetFlt: got event %s(0x%lx) on %s, pDev=%p pThis=%p pThis->u.s.pDev=%p\n",
diff --git a/debian/patches/series b/debian/patches/series
index c1924d2..0dd7d2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 37-linux-3.11.patch
+38-linux-3.11-vboxnet.patch

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