[Pkg-virtualbox-commits] [virtualbox] 01/02: Fix VBox network interface error on Linux 3.11. (Closes: #721786)

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository virtualbox.

commit b1f8c19f291b2067c6a1f916bebfdc8c81493e59
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Sep 19 21:49:07 2013 +0200

    Fix VBox network interface error on Linux 3.11. (Closes: #721786)
    
    * Fix VBox network interface error on Linux 3.11. (Closes: #721786)
      - Extend 37-linux-3.11.patch
---
 debian/changelog                   |    8 ++++++++
 debian/patches/37-linux-3.11.patch |   19 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80638c5..27989d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (4.2.16-dfsg-3) UNRELEASED; urgency=low
+
+  [ Ritesh Raj Sarraf ]
+  * Fix VBox network interface error on Linux 3.11. (Closes: #721786)
+    - Extend 37-linux-3.11.patch
+
+ -- Felix Geyer <fgeyer at debian.org>  Thu, 19 Sep 2013 21:47:43 +0200
+
 virtualbox (4.2.16-dfsg-2) unstable; urgency=low
 
   [ Whoopie ]
diff --git a/debian/patches/37-linux-3.11.patch b/debian/patches/37-linux-3.11.patch
index f3e64a7..19a577f 100644
--- a/debian/patches/37-linux-3.11.patch
+++ b/debian/patches/37-linux-3.11.patch
@@ -1,5 +1,6 @@
-Description: Additions/linux/sharefolders: fix for Linux 3.11+ (thanks Azat Khuzhin)
-Origin: upstream, https://www.virtualbox.org/changeset/47588/vbox
+Description: Fix for Linux 3.11
+Origin: upstream, https://www.virtualbox.org/changeset/47588/vbox and
+ https://www.virtualbox.org/changeset/47484/vbox
 
 --- a/src/VBox/Additions/linux/sharedfolders/dirops.c
 +++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
@@ -72,3 +73,17 @@ Origin: upstream, https://www.virtualbox.org/changeset/47588/vbox
      .release = sf_dir_release,
      .read    = generic_read_dir
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -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",

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