| 1 |
prometheanfire 14/09/03 16:27:36 |
| 2 |
|
| 3 |
Added: virtualbox-modules-3.17.patch |
| 4 |
Log: |
| 5 |
bumping for 3.17 support |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: virtualbox-modules-3.17.patch |
| 16 |
=================================================================== |
| 17 |
diff -rupN work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c |
| 18 |
--- work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2014-01-14 04:27:06.000000000 -0600 |
| 19 |
+++ work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2014-09-03 11:12:28.247795756 -0500 |
| 20 |
@@ -191,7 +191,7 @@ static PRTMEMHDR rtR0MemAllocExecVmArea( |
| 21 |
struct page **papPagesIterator = papPages; |
| 22 |
pVmArea->nr_pages = cPages; |
| 23 |
pVmArea->pages = papPages; |
| 24 |
- if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, &papPagesIterator)) |
| 25 |
+ if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, papPagesIterator)) |
| 26 |
{ |
| 27 |
PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr; |
| 28 |
pHdrEx->pVmArea = pVmArea; |
| 29 |
diff -rupN work/vboxnetadp/linux/VBoxNetAdp-linux.c work.new/vboxnetadp/linux/VBoxNetAdp-linux.c |
| 30 |
--- work/vboxnetadp/linux/VBoxNetAdp-linux.c 2013-10-09 06:02:09.000000000 -0500 |
| 31 |
+++ work.new/vboxnetadp/linux/VBoxNetAdp-linux.c 2014-09-03 11:13:55.999687819 -0500 |
| 32 |
@@ -52,6 +52,25 @@ |
| 33 |
|
| 34 |
#define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface)) |
| 35 |
|
| 36 |
+/******************************* |
| 37 |
+source for the 4th parameter alloc_netdev fix for kernel 3.17-rc1 is: |
| 38 |
+https://github.com/proski/madwifi/commit/c5246021b7b8580c2aeb0a145903acc07d246ac1 |
| 39 |
+*/ |
| 40 |
+#ifndef NET_NAME_UNKNOWN |
| 41 |
+#undef alloc_netdev |
| 42 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) |
| 43 |
+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ |
| 44 |
+ alloc_netdev(sizeof_priv, name, setup) |
| 45 |
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) |
| 46 |
+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ |
| 47 |
+ alloc_netdev_mq(sizeof_priv, name, setup, 1) |
| 48 |
+#else |
| 49 |
+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ |
| 50 |
+ alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) |
| 51 |
+#endif |
| 52 |
+#endif |
| 53 |
+/*******************************/ |
| 54 |
+ |
| 55 |
/******************************************************************************* |
| 56 |
* Internal Functions * |
| 57 |
*******************************************************************************/ |
| 58 |
@@ -183,6 +202,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis |
| 59 |
/* No need for private data. */ |
| 60 |
pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV), |
| 61 |
pThis->szName[0] ? pThis->szName : VBOXNETADP_LINUX_NAME, |
| 62 |
+ NET_NAME_UNKNOWN, |
| 63 |
vboxNetAdpNetDevInit); |
| 64 |
if (pNetDev) |
| 65 |
{ |
Archives