← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox/vivid

« back to all changes in this revision

Viewing changes to debian/patches/37-linux-3.11.patch

  • Committer: Package Import Robot
  • Author(s): Felix Geyer, Ritesh Raj Sarraf
  • Date: 2013-09-19 21:52:12 UTC
  • mfrom: (3.3.3 sid)
  • Revision ID: package-import@ubuntu.com-20130919215212-wbjx4m7dhw4zi3ha
Tags: 4.2.16-dfsg-3
http://bugs.debian.org/721786
[ Ritesh Raj Sarraf ]
* Fix VBox network interface error on Linux 3.11. (Closes: #721786)
  - Extend 37-linux-3.11.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/37-linux-3.11.patch
1
 
Description: Additions/linux/sharefolders: fix for Linux 3.11+ (thanks Azat Khuzhin)
2
 
Origin: upstream, https://www.virtualbox.org/changeset/47588/vbox
 
1
Description: Fix for Linux 3.11
 
2
Origin: upstream, https://www.virtualbox.org/changeset/47588/vbox and
 
3
 https://www.virtualbox.org/changeset/47484/vbox
3
4
 
4
5
--- a/src/VBox/Additions/linux/sharedfolders/dirops.c
5
6
+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
72
73
     .release = sf_dir_release,
73
74
     .read    = generic_read_dir
74
75
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
 
76
--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
 
77
+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
 
78
@@ -1804,7 +1804,11 @@
 
79
 
 
80
 {
 
81
     PVBOXNETFLTINS      pThis = VBOX_FLT_NB_TO_INST(self);
 
82
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
 
83
+    struct net_device  *pDev  = netdev_notifier_info_to_dev(ptr);
 
84
+#else
 
85
     struct net_device  *pDev  = (struct net_device *)ptr;
 
86
+#endif
 
87
     int                 rc    = NOTIFY_OK;
 
88
 
 
89
     Log(("VBoxNetFlt: got event %s(0x%lx) on %s, pDev=%p pThis=%p pThis->u.s.pDev=%p\n",