[patch] patch for app-emulation/virtualbox

virtualbox.patch (text/plain), 2.97 KB, created by Harald Weiner on 2014-10-21 06:42:40 UTC

diff -pru5 -- VirtualBox-4.2.24/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c VirtualBox-4.2.24/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
--- VirtualBox-4.2.24/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c	2014-07-15 19:24:57.000000000 +0200
+++ VirtualBox-4.2.24/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c	2014-08-18 13:52:24.292185943 +0200
@@ -50,10 +50,29 @@
 #define VBOXNETADP_LINUX_NAME      "vboxnet%d"
 #define VBOXNETADP_CTL_DEV_NAME    "vboxnetctl"
 
 #define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
 
+/*******************************
+source for the 4th parameter alloc_netdev fix for kernel 3.17-rc1 is:
+https://github.com/proski/madwifi/commit/c5246021b7b8580c2aeb0a145903acc07d246ac1
+*/
+#ifndef NET_NAME_UNKNOWN
+#undef alloc_netdev
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
+  alloc_netdev(sizeof_priv, name, setup)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
+  alloc_netdev_mq(sizeof_priv, name, setup, 1)
+#else
+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
+  alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
+#endif
+#endif
+/*******************************/
+
 /*******************************************************************************
 *   Internal Functions                                                         *
 *******************************************************************************/
 static int  VBoxNetAdpLinuxInit(void);
 static void VBoxNetAdpLinuxUnload(void);
@@ -181,10 +200,11 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
     struct net_device *pNetDev;
 
     /* No need for private data. */
     pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV),
                            pThis->szName[0] ? pThis->szName : VBOXNETADP_LINUX_NAME,
+                           NET_NAME_UNKNOWN,
                            vboxNetAdpNetDevInit);
     if (pNetDev)
     {
         int err;
 
diff -pru5 -- VirtualBox-4.2.24/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c VirtualBox-4.2.24/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
--- VirtualBox-4.2.24/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c	2014-07-15 19:25:23.000000000 +0200
+++ VirtualBox-4.2.24/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c	2014-08-18 13:37:53.257621846 +0200
@@ -189,11 +189,11 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
          * in the free function, if nothing else...
          */
         struct page **papPagesIterator = papPages;
         pVmArea->nr_pages = cPages;
         pVmArea->pages    = papPages;
-        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, &papPagesIterator))
+        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, papPagesIterator))
         {
             PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
             pHdrEx->pVmArea     = pVmArea;
             pHdrEx->pvDummy     = NULL;
             return &pHdrEx->Hdr;